kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor based on code review

Browse source
This commit is contained in:
Michael Kozono 2017-09-05 17:10:30 -07:00
parent f25b5b7f8d
commit a4b564b620
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/namespace.rb
View file

@ -46,7 +46,7 @@ class Namespace < ActiveRecord::Base
before_create :sync_share_with_group_lock_with_parent
before_update :sync_share_with_group_lock_with_parent, if: :parent_changed?
after_commit :force_share_with_group_lock_on_descendants, on: :update, if: -> { previous_changes.key?('share_with_group_lock') && share_with_group_lock? }
after_update :force_share_with_group_lock_on_descendants, if: -> { share_with_group_lock_changed? && share_with_group_lock? }
# Legacy Storage specific hooks
@ -225,7 +225,7 @@ class Namespace < ActiveRecord::Base
end
def sync_share_with_group_lock_with_parent
if has_parent? && parent.share_with_group_lock?
if parent&.share_with_group_lock?
self.share_with_group_lock = true
end
end

2
app/policies/group_policy.rb
View file

@ -15,7 +15,7 @@ class GroupPolicy < BasePolicy
condition(:nested_groups_supported, scope: :global) { Group.supports_nested_groups? }
condition(:parent_share_locked) { @subject.has_parent? && @subject.parent.share_with_group_lock? }
condition(:parent_share_locked, scope: :subject) { @subject.parent&.share_with_group_lock? }
condition(:can_change_parent_share_with_group_lock) { @subject.has_parent? && can?(:change_share_with_group_lock, @subject.parent) }
condition(:has_projects) do

2
app/services/concerns/update_visibility_level.rb
View file

@ -1,5 +1,5 @@
module UpdateVisibilityLevel
def visibility_level_allowed?(target, new_visibility)
def valid_visibility_level_change?(target, new_visibility)
# check that user is allowed to set specified visibility_level
if new_visibility && new_visibility.to_i != target.visibility_level
unless can?(current_user, :change_visibility_level, target) &&

2
app/services/groups/update_service.rb
View file

@ -5,7 +5,7 @@ module Groups
def execute
reject_parent_id!
return false unless visibility_level_allowed?(group, params[:visibility_level])
return false unless valid_visibility_level_change?(group, params[:visibility_level])
return false unless valid_share_with_group_lock_change?

2
app/services/projects/update_service.rb
View file

@ -3,7 +3,7 @@ module Projects
include UpdateVisibilityLevel
def execute
unless visibility_level_allowed?(project, params[:visibility_level])
unless valid_visibility_level_change?(project, params[:visibility_level])
return error('New visibility level not allowed!')
end

6
spec/models/namespace_spec.rb
View file

@ -433,7 +433,7 @@ describe Namespace do
let!(:subgroup) { create(:group, parent: root_group )}
it 'the subgroup share lock becomes enabled' do
root_group.update(share_with_group_lock: true)
root_group.update!(share_with_group_lock: true)
expect(subgroup.reload.share_with_group_lock).to be_truthy
end
@ -446,7 +446,7 @@ describe Namespace do
let(:subgroup) { create(:group, parent: root_group, share_with_group_lock: true )}
it 'the subgroup share lock does not change' do
root_group.update(share_with_group_lock: false)
root_group.update!(share_with_group_lock: false)
expect(subgroup.reload.share_with_group_lock).to be_truthy
end
@ -456,7 +456,7 @@ describe Namespace do
let(:subgroup) { create(:group, parent: root_group )}
it 'the subgroup share lock does not change' do
root_group.update(share_with_group_lock: false)
root_group.update!(share_with_group_lock: false)
expect(subgroup.reload.share_with_group_lock?).to be_falsey
end