Commit edf8dd44 authored by Michael Kozono's avatar Michael Kozono

Simplify disabling checkbox

parent c7e17abd
...@@ -3,6 +3,10 @@ module GroupsHelper ...@@ -3,6 +3,10 @@ module GroupsHelper
can?(current_user, :change_visibility_level, group) can?(current_user, :change_visibility_level, group)
end end
def can_change_share_with_group_lock?(group)
can?(current_user, :change_share_with_group_lock, group)
end
def group_icon(group) def group_icon(group)
if group.is_a?(String) if group.is_a?(String)
group = Group.find_by_full_path(group) group = Group.find_by_full_path(group)
...@@ -65,14 +69,6 @@ module GroupsHelper ...@@ -65,14 +69,6 @@ module GroupsHelper
{ group_name: group.name } { group_name: group.name }
end end
def share_with_group_lock_disabled
return false unless @group.has_parent?
return false unless @group.parent.share_with_group_lock?
return false unless @group.share_with_group_lock?
return false if @group.has_owner?(current_user)
return true
end
def share_with_group_lock_help_text def share_with_group_lock_help_text
return default_help unless @group.has_parent? return default_help unless @group.has_parent?
return default_help unless @group.parent.share_with_group_lock? return default_help unless @group.parent.share_with_group_lock?
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
.col-sm-10 .col-sm-10
.checkbox .checkbox
= f.label :share_with_group_lock do = f.label :share_with_group_lock do
= f.check_box :share_with_group_lock, disabled: share_with_group_lock_disabled = f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group)
%strong %strong
- group_link = link_to @group.name, group_path(@group) - group_link = link_to @group.name, group_path(@group)
= s_("GroupSettings|Prevent sharing a project within %{group} with other groups").html_safe % { group: group_link } = s_("GroupSettings|Prevent sharing a project within %{group} with other groups").html_safe % { group: group_link }
......
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