Only display the Global section when requesting to show global roles

opf · Jul 19, 2023 · 25c3ce5 · 25c3ce5
1 parent 86f4a55
commit 25c3ce5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/services/roles/set_attributes_service.rb b/app/services/roles/set_attributes_service.rb
@@ -29,7 +29,7 @@
 module Roles
   class SetAttributesService < ::BaseServices::SetAttributes
     def set_default_attributes(*)
-      model.permissions = Role.non_member.permissions if model.permissions.nil? || model.permissions.empty?
+      model.permissions = Role.non_member.permissions if model.permissions.blank?
     end
   end
 end
diff --git a/app/views/roles/_permissions.html.erb b/app/views/roles/_permissions.html.erb
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
 <% permissions.each do |mod, mod_permissions| %>
+  <% next if mod.blank? && !show_global_role %>
   <% global_prefix = show_global_role ? 'fieldset--global--' : 'fieldset--' %>
   <% module_name = mod.blank? ? 'fieldset--global--' + Project.model_name.human.downcase.gsub(' ', '_') : global_prefix + l_or_humanize(mod, prefix: 'project_module_').downcase.gsub(' ', '_') %>
   <% module_id = module_name.parameterize  %>