Commit db93bec3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add group_access validation to ProjectGroupLink

parent 09b1f305
...@@ -16,14 +16,11 @@ class ProjectGroupLink < ActiveRecord::Base ...@@ -16,14 +16,11 @@ class ProjectGroupLink < ActiveRecord::Base
validates :project_id, presence: true validates :project_id, presence: true
validates :group_id, presence: true validates :group_id, presence: true
validates :group_id, uniqueness: { scope: [:project_id], message: "already shared with this group" } validates :group_id, uniqueness: { scope: [:project_id], message: "already shared with this group" }
validates :group_access, presence: true
validates :group_access, inclusion: { in: Gitlab::Access.values }, presence: true
def self.access_options def self.access_options
{ Gitlab::Access.options
"Guest" => GUEST,
"Reporter" => REPORTER,
"Developer" => DEVELOPER,
"Master" => MASTER
}
end end
def self.default_access def self.default_access
......
...@@ -17,5 +17,6 @@ describe ProjectGroupLink do ...@@ -17,5 +17,6 @@ describe ProjectGroupLink do
it { should validate_presence_of(:project_id) } it { should validate_presence_of(:project_id) }
it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) } it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) }
it { should validate_presence_of(:group_id) } it { should validate_presence_of(:group_id) }
it { should validate_presence_of(:group_access) }
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment