Simplify disabling checkbox

This commit is contained in:
Michael Kozono 2017-09-05 12:43:48 -07:00
parent c7e17abd26
commit edf8dd44f7
2 changed files with 5 additions and 9 deletions

View File

@ -3,6 +3,10 @@ module GroupsHelper
can?(current_user, :change_visibility_level, group)
end
def can_change_share_with_group_lock?(group)
can?(current_user, :change_share_with_group_lock, group)
end
def group_icon(group)
if group.is_a?(String)
group = Group.find_by_full_path(group)
@ -65,14 +69,6 @@ module GroupsHelper
{ group_name: group.name }
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
return default_help unless @group.has_parent?
return default_help unless @group.parent.share_with_group_lock?

View File

@ -34,7 +34,7 @@
.col-sm-10
.checkbox
= 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
- 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 }