From b0bc997de5463a79b8c4c7eeceb0337ca2cc0db2 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 9 May 2022 13:56:11 -0400 Subject: [PATCH 01/10] reduce list of projects for admin resolves #1187" --- BrainPortal/app/helpers/select_box_helper.rb | 6 ++++++ BrainPortal/app/views/groups/show.html.erb | 2 +- BrainPortal/app/views/shared/_group_tables.html.erb | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index 63ca15f7b..b4f09218a 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -108,6 +108,12 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = groups = options.has_key?(:groups) ? (options[:groups] || []) : current_user.assignable_groups groups = groups.all.to_a if groups.is_a?(ActiveRecord::Relation) + # for Admin filter out only public, invisible or non_assignable to reduce the clutter + groups = groups.select do |g| + g.instance_of? WorkGroup && (g.public || g.invisible || (g.not_assignable && + g.user_ids.include?(current_user.id ) )) + end if current_user.has_role? :adminuser + if selector.respond_to?(:group_id) selected = selector.group_id.to_s elsif selector.is_a?(Group) diff --git a/BrainPortal/app/views/groups/show.html.erb b/BrainPortal/app/views/groups/show.html.erb index 385b089d2..cdb23cb93 100644 --- a/BrainPortal/app/views/groups/show.html.erb +++ b/BrainPortal/app/views/groups/show.html.erb @@ -26,7 +26,7 @@ <% if @group.is_a?(WorkGroup) %>
- <% if (@group.creator_id != current_user.id && !@group.public? && current_user.assignable_group_ids.include?(@group.id) %> + <% if @group.creator_id != current_user.id && !@group.public? && current_user.assignable_group_ids.include?(@group.id) %> <%= link_to 'Leave Project', {:action => :unregister, :id => @group.id}, :class => "button", :method => :post %> <% end %> <% if @group.can_be_edited_by?(current_user) %> diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index fec0288db..2f7f82510 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -24,7 +24,8 @@ <% if current_user.has_role? :admin_user - work_groups = WorkGroup.where(invisible: false).all + work_groups = WorkGroup.where(invisible: false, public: true).all + work_groups += WorkGroup.where(invisible: false, public: false, not_assignable: true, users: current_user.id).all invis_groups = WorkGroup.where(invisible: true).all elsif current_user.has_role? :site_manager work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) From b5e7fc65e042a9c1ac40fd8c93f53ecca910b0b2 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 9 May 2022 17:29:59 -0400 Subject: [PATCH 02/10] add other admin users (mostly for tools setup) fixes #1187 --- BrainPortal/app/helpers/select_box_helper.rb | 20 +++++++++++++------ .../app/views/shared/_group_tables.html.erb | 5 ++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index b4f09218a..bf0d17e87 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -108,12 +108,6 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = groups = options.has_key?(:groups) ? (options[:groups] || []) : current_user.assignable_groups groups = groups.all.to_a if groups.is_a?(ActiveRecord::Relation) - # for Admin filter out only public, invisible or non_assignable to reduce the clutter - groups = groups.select do |g| - g.instance_of? WorkGroup && (g.public || g.invisible || (g.not_assignable && - g.user_ids.include?(current_user.id ) )) - end if current_user.has_role? :adminuser - if selector.respond_to?(:group_id) selected = selector.group_id.to_s elsif selector.is_a?(Group) @@ -124,6 +118,20 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = selected = selector.to_s end + # for Admin filter out only public, invisible or non_assignable to reduce the clutter + if current_user.has_role? :admin_user + current_user_id = current_user.id + admin_ids = AdminUser.all.pluck(:id) || [] + groups = groups.select do |g| + ( g.instance_of?(SystemGroup) || + g.instance_of?(UserGroup) && admin_ids.include?(g.creator_id) || + g.public || + g.invisible || + (g.not_assignable && g.user_ids & admin_ids ) || + (selected == g.id.to_s) || selected.include?(g.id.to_s)) + end + end + # Optimize the labels for UserGroups and SiteGroups, by extracting in a hash group_labels = {} group_labels.merge!(UserGroup.prepare_pretty_labels(groups)) diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index 2f7f82510..5a3a23e35 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -24,8 +24,11 @@ <% if current_user.has_role? :admin_user + admin_ids = AdminUser.all.pluck(:id) || [] work_groups = WorkGroup.where(invisible: false, public: true).all - work_groups += WorkGroup.where(invisible: false, public: false, not_assignable: true, users: current_user.id).all + work_groups += WorkGroup.joins(:users).where(invisible: false, public: false, not_assignable: true, + "users.id" => admin_ids).all + work_groups = (work_groups + model.groups).uniq invis_groups = WorkGroup.where(invisible: true).all elsif current_user.has_role? :site_manager work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) From bc5dac7bb0d244c92eeea7c68baa9d9b8d1e2dfb Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Tue, 10 May 2022 18:04:57 -0400 Subject: [PATCH 03/10] add misc public categories reduce list of projects for admin resolves #1187 --- BrainPortal/app/helpers/select_box_helper.rb | 18 ++++--- BrainPortal/app/models/work_group.rb | 12 ++++- .../app/views/shared/_group_tables.html.erb | 48 ++++++++++++++----- 3 files changed, 57 insertions(+), 21 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index bf0d17e87..d07940105 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -123,12 +123,14 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = current_user_id = current_user.id admin_ids = AdminUser.all.pluck(:id) || [] groups = groups.select do |g| - ( g.instance_of?(SystemGroup) || - g.instance_of?(UserGroup) && admin_ids.include?(g.creator_id) || + ( g.instance_of?(SystemGroup) || # everyone group + g.instance_of?(UserGroup) && (admin_ids & g.user_ids).present? || # admin usergroups g.public || g.invisible || - (g.not_assignable && g.user_ids & admin_ids ) || - (selected == g.id.to_s) || selected.include?(g.id.to_s)) + g.not_assignable && (g.user_ids & admin_ids ).present? || # notassingable admin groups + g.not_assignable && admin_ids.include?(g.creator_id) || # notassignable created by admin + (selected == g.id.to_s) || selected.include?(g.id.to_s) # already selected + ) end end @@ -159,15 +161,17 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = # Step 1: My Work Projects first ordered_category_grouped << [ "My Work Projects", category_grouped_pairs.delete("My Work Projects") ] if category_grouped_pairs["My Work Projects"] - + ordered_category_grouped << [ "My Public Work Projects", category_grouped_pairs.delete("My Public Work Projects") ] if category_grouped_pairs["My Public Work Projects"] # Step 2: All personal work projects first - category_grouped_pairs.keys.select { |proj| proj =~ /Personal Work Projects/ }.sort.each do |proj| + category_grouped_pairs.keys.select { |proj| proj =~ /Personal (Public )?Work Projects/ }.sort.each do |proj| ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] end - # Step 3: Other project categories, in that order [ "Shared Work Projects", "Empty Work Projects", "Site Projects", "User Projects", "System Projects", "Invisible Projects", "Everyone Projects" ].each do |proj| ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] if category_grouped_pairs[proj] + proj = proj.sub(" ", " Public ") + ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] if category_grouped_pairs[proj] + end # Step 4: Other mysterious categories ?!? diff --git a/BrainPortal/app/models/work_group.rb b/BrainPortal/app/models/work_group.rb index c7f1851fe..2fb80a6df 100644 --- a/BrainPortal/app/models/work_group.rb +++ b/BrainPortal/app/models/work_group.rb @@ -77,7 +77,17 @@ def self.prepare_pretty_category_names(groups = [], as_user = nil) wgs end - def pretty_category_name(as_user) #:nodoc: + def pretty_category_name(as_user = nil) #:nodoc: + category = pretty_category_name_no_pub(as_user) + if category.present? && self.public && ! category.include?('Public') && as_user.has_role?(:admin_user) + category.sub(" ", " Public ") + # category.split(' ', 2).insert(1, "Public").join # works even for empty str + else + category + end + end + + def pretty_category_name_no_pub(as_user) #:nodoc: return @_pretty_category_name if @_pretty_category_name if self.invisible? @_pretty_category_name = 'Invisible Project' diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index 5a3a23e35..ff28ea19a 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -24,22 +24,26 @@ <% if current_user.has_role? :admin_user - admin_ids = AdminUser.all.pluck(:id) || [] - work_groups = WorkGroup.where(invisible: false, public: true).all - work_groups += WorkGroup.joins(:users).where(invisible: false, public: false, not_assignable: true, - "users.id" => admin_ids).all - work_groups = (work_groups + model.groups).uniq + admin_ids = AdminUser.all.pluck(:id) || [] + public_groups = WorkGroup.where(invisible: false, public: true).all + nonassign_groups = WorkGroup.joins(:users).where(invisible: false, public: false, + not_assignable: true, "users.id" => admin_ids).all + work_groups = model.groups.select {|g| g.is_a?(WorkGroup) && ! g.invisible && ! g.public && + ! nonassign_groups.include?(g)} invis_groups = WorkGroup.where(invisible: true).all elsif current_user.has_role? :site_manager work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) invis_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => true ) + public_groups = [] else - work_groups = [] - invis_groups = [] + work_groups = [] + invis_groups = [] + public_groups = [] end - work_groups = work_groups.sort { |a,b| a.name <=> b.name } - invis_groups = invis_groups.sort { |a,b| a.name <=> b.name } - class_name = model.class.sti_root_class.to_s.underscore + work_groups = work_groups.sort { |a,b| a.name <=> b.name } + invis_groups = invis_groups.sort { |a,b| a.name <=> b.name } + public_groups = public_groups.sort { |a,b| a.name <=> b.name } + class_name = model.class.sti_root_class.to_s.underscore %> <% @@ -60,15 +64,13 @@ <% if work_groups.present? %> - + <%= array_to_table(work_groups, :cols => 4, :td_class => 'left_align no_wrap') do |group,r,c| %> <%= group_check_box.(group) %> <% end %> <% end %> - - <% if invis_groups.present? %>
@@ -79,3 +81,23 @@ <% end %> +<% if public_groups.present? %> + +
+ + <%= array_to_table(public_groups, :cols => 4, :td_class => 'left_align no_wrap') do |group,r,c| %> + <%= group_check_box.(group) %> + <% end %> + +<% end %> + + +<% if nonassign_groups.present? %> + +
+ + <%= array_to_table(nonassign_groups, :cols => 4, :td_class => 'left_align no_wrap') do |group,r,c| %> + <%= group_check_box.(group) %> + <% end %> + +<% end %> From 29bcd5dd4ee220b2c5055d26b6258b9591d3e502 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Wed, 11 May 2022 07:32:24 -0400 Subject: [PATCH 04/10] add back few more projects for admin resolves #1187 --- BrainPortal/app/helpers/select_box_helper.rb | 4 +-- .../app/views/shared/_group_tables.html.erb | 28 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index d07940105..d7b9a7044 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -123,8 +123,8 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = current_user_id = current_user.id admin_ids = AdminUser.all.pluck(:id) || [] groups = groups.select do |g| - ( g.instance_of?(SystemGroup) || # everyone group - g.instance_of?(UserGroup) && (admin_ids & g.user_ids).present? || # admin usergroups + ( g.is_a?(SystemGroup) || # everyone group, to make a private tool public + g.is_a?(UserGroup) && (admin_ids & g.user_ids).present? || # admin usergroups g.public || g.invisible || g.not_assignable && (g.user_ids & admin_ids ).present? || # notassingable admin groups diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index ff28ea19a..435a1b7cd 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -24,16 +24,19 @@ <% if current_user.has_role? :admin_user - admin_ids = AdminUser.all.pluck(:id) || [] - public_groups = WorkGroup.where(invisible: false, public: true).all - nonassign_groups = WorkGroup.joins(:users).where(invisible: false, public: false, - not_assignable: true, "users.id" => admin_ids).all - work_groups = model.groups.select {|g| g.is_a?(WorkGroup) && ! g.invisible && ! g.public && - ! nonassign_groups.include?(g)} - invis_groups = WorkGroup.where(invisible: true).all + admin_ids = AdminUser.all.pluck(:id) || [] + public_groups = WorkGroup.where( invisible: false, public: true ).all + nonassign_groups = WorkGroup.joins(:users).where( invisible: false, public: false, + not_assignable: true, "users.id" => admin_ids ).all + nonassign_groups |= WorkGroup.where( invisible: false, public: false, + not_assignable: true, creator_id: admin_ids ).all + nonassign_groups = nonassign_groups.uniq + work_groups = model.groups.select { |g| g.is_a?(WorkGroup) && ! g.invisible && ! g.public && + ! nonassign_groups.include?(g) } + invis_groups = WorkGroup.where( invisible: true ).all elsif current_user.has_role? :site_manager - work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) - invis_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => true ) + work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) + invis_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => true ) public_groups = [] else work_groups = [] @@ -64,13 +67,15 @@ <% if work_groups.present? %> - + <%= array_to_table(work_groups, :cols => 4, :td_class => 'left_align no_wrap') do |group,r,c| %> <%= group_check_box.(group) %> <% end %> <% end %> + + <% if invis_groups.present? %>
@@ -81,6 +86,8 @@ <% end %> + + <% if public_groups.present? %>
@@ -92,6 +99,7 @@ <% end %> + <% if nonassign_groups.present? %>
From 78804262f6fda54bba0e18cc7f3a0896823136e5 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 30 May 2022 10:51:12 -0400 Subject: [PATCH 05/10] refactor several pretty name methods into one, admin groups fixes #1187 --- BrainPortal/app/helpers/select_box_helper.rb | 2 +- BrainPortal/app/models/work_group.rb | 41 +++++++++----------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index d7b9a7044..14b858822 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -167,7 +167,7 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] end # Step 3: Other project categories, in that order - [ "Shared Work Projects", "Empty Work Projects", "Site Projects", "User Projects", "System Projects", "Invisible Projects", "Everyone Projects" ].each do |proj| + [ "Shared Work Projects", "Empty Work Projects", "Site Projects", "System Projects", "Invisible Projects", "Everyone Projects", "User Projects"].each do |proj| ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] if category_grouped_pairs[proj] proj = proj.sub(" ", " Public ") ordered_category_grouped << [ proj, category_grouped_pairs.delete(proj) ] if category_grouped_pairs[proj] diff --git a/BrainPortal/app/models/work_group.rb b/BrainPortal/app/models/work_group.rb index 2fb80a6df..99b9b9be4 100644 --- a/BrainPortal/app/models/work_group.rb +++ b/BrainPortal/app/models/work_group.rb @@ -78,31 +78,28 @@ def self.prepare_pretty_category_names(groups = [], as_user = nil) end def pretty_category_name(as_user = nil) #:nodoc: - category = pretty_category_name_no_pub(as_user) - if category.present? && self.public && ! category.include?('Public') && as_user.has_role?(:admin_user) - category.sub(" ", " Public ") - # category.split(' ', 2).insert(1, "Public").join # works even for empty str - else - category - end - end - def pretty_category_name_no_pub(as_user) #:nodoc: - return @_pretty_category_name if @_pretty_category_name - if self.invisible? - @_pretty_category_name = 'Invisible Project' - elsif self.public? - @_pretty_category_name = 'Public Project' - elsif self.users.count == 0 - @_pretty_category_name = 'Empty Work Project' - elsif self.users.count > 1 - @_pretty_category_name = 'Shared Work Project' - elsif as_user.present? && (self.creator_id == as_user.id || self.users.first.id == as_user.id) - @_pretty_category_name = 'My Work Project' + if @_pretty_category_name.blank? + if self.invisible? + @_pretty_category_name = 'Invisible Project' + elsif self.public? + @_pretty_category_name = 'Public Project' + elsif self.users.count == 0 + @_pretty_category_name = 'Empty Work Project' + elsif self.users.count > 1 + @_pretty_category_name = 'Shared Work Project' + elsif as_user.present? && (self.creator_id == as_user.id || self.users.first.id == as_user.id) + @_pretty_category_name = 'My Work Project' + else + @_pretty_category_name = "Personal Work Project of #{self.users.first.full_name}" + end + end + # Public is more of quantifier, there could be public shared or public personal projects + if @_pretty_category_name.present? && self.public && ! @_pretty_category_name.include?('Public') + @_pretty_category_name = @_pretty_category_name.sub(" ", " Public ") else - @_pretty_category_name = "Personal Work Project of #{self.users.first.full_name}" + @_pretty_category_name end - @_pretty_category_name end def short_pretty_type #:nodoc: From 816df7dfbecb412fa943a443adce95421e65c377 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 6 Jun 2022 12:59:47 -0400 Subject: [PATCH 06/10] a refactoring of public group variable of a group table view resolves #1187 --- BrainPortal/app/views/shared/_group_tables.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index 435a1b7cd..972514979 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -23,6 +23,7 @@ -%> <% + public_groups = [] if current_user.has_role? :admin_user admin_ids = AdminUser.all.pluck(:id) || [] public_groups = WorkGroup.where( invisible: false, public: true ).all @@ -37,11 +38,10 @@ elsif current_user.has_role? :site_manager work_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => false ).all | current_user.groups.where( :type => "WorkGroup", :invisible => false ) invis_groups = current_user.site.groups.where( :type => "WorkGroup", :invisible => true ) - public_groups = [] else work_groups = [] invis_groups = [] - public_groups = [] + end work_groups = work_groups.sort { |a,b| a.name <=> b.name } invis_groups = invis_groups.sort { |a,b| a.name <=> b.name } From 232d7b7a3b0fb65c52794266b285215fc85235bb Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 6 Jun 2022 13:00:44 -0400 Subject: [PATCH 07/10] a refactoring of public group variable of a group table view resolves #1187 --- BrainPortal/app/views/shared/_group_tables.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/BrainPortal/app/views/shared/_group_tables.html.erb b/BrainPortal/app/views/shared/_group_tables.html.erb index 972514979..1de78e117 100644 --- a/BrainPortal/app/views/shared/_group_tables.html.erb +++ b/BrainPortal/app/views/shared/_group_tables.html.erb @@ -41,7 +41,6 @@ else work_groups = [] invis_groups = [] - end work_groups = work_groups.sort { |a,b| a.name <=> b.name } invis_groups = invis_groups.sort { |a,b| a.name <=> b.name } From 809af83906b56066a3d05effc786ec66bd1419cf Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 23 Jan 2023 15:41:40 -0500 Subject: [PATCH 08/10] minor fix in group select --- BrainPortal/app/helpers/select_box_helper.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BrainPortal/app/helpers/select_box_helper.rb b/BrainPortal/app/helpers/select_box_helper.rb index 14b858822..1ebb99797 100644 --- a/BrainPortal/app/helpers/select_box_helper.rb +++ b/BrainPortal/app/helpers/select_box_helper.rb @@ -118,9 +118,8 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options = selected = selector.to_s end - # for Admin filter out only public, invisible or non_assignable to reduce the clutter - if current_user.has_role? :admin_user - current_user_id = current_user.id + # for Admin filter out only public, invisible or non_assignable to reduce the clutter (unless groups passed) + if current_user.has_role?(:admin_user) && !options.has_key?(:groups) admin_ids = AdminUser.all.pluck(:id) || [] groups = groups.select do |g| ( g.is_a?(SystemGroup) || # everyone group, to make a private tool public From 69f24cb335569ff19fc3cdca35cbdeeea545a586 Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Mon, 17 Apr 2023 15:57:02 -0400 Subject: [PATCH 09/10] add a redundant return to wg pretty categories --- BrainPortal/app/models/work_group.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/BrainPortal/app/models/work_group.rb b/BrainPortal/app/models/work_group.rb index 99b9b9be4..dbb9a008a 100644 --- a/BrainPortal/app/models/work_group.rb +++ b/BrainPortal/app/models/work_group.rb @@ -100,6 +100,7 @@ def pretty_category_name(as_user = nil) #:nodoc: else @_pretty_category_name end + @_pretty_category_name end def short_pretty_type #:nodoc: From f35dd419db3c52f04d837300e8c68e6f9c20321c Mon Sep 17 00:00:00 2001 From: MontrealSergiy Date: Thu, 20 Apr 2023 13:42:38 -0400 Subject: [PATCH 10/10] put back an old buggy pretty category optimization --- BrainPortal/app/models/work_group.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BrainPortal/app/models/work_group.rb b/BrainPortal/app/models/work_group.rb index dbb9a008a..dc3ff49a9 100644 --- a/BrainPortal/app/models/work_group.rb +++ b/BrainPortal/app/models/work_group.rb @@ -78,7 +78,7 @@ def self.prepare_pretty_category_names(groups = [], as_user = nil) end def pretty_category_name(as_user = nil) #:nodoc: - + return @_pretty_category_name if @_pretty_category_name if @_pretty_category_name.blank? if self.invisible? @_pretty_category_name = 'Invisible Project'