diff --git a/BrainPortal/app/views/tool_configs/_by_resource.erb b/BrainPortal/app/views/tool_configs/_by_resource.erb index 2f6e3851a..b75f7984d 100644 --- a/BrainPortal/app/views/tool_configs/_by_resource.erb +++ b/BrainPortal/app/views/tool_configs/_by_resource.erb @@ -97,7 +97,7 @@ <%= for_tool ? "Execution Servers" : "Tools" %> Versions Configured Projects In Effect - Users with access problem(s) out of <%= users.count %> + Users Access Summary <% end %> @@ -149,20 +149,25 @@ users_with_access_pb = users.select do |user| !user_can_access_resource[user] || !user_can_access_versus[user] || !tc.can_be_accessed_by?(user) end - - - + users_with_access = users - users_with_access_pb %> - + <% tool_pb, exec_pb = user_can_access_versus, user_can_access_resource %> + <% exec_pb, tool_pb = tool_pb, exec_pb if for_tool %> - <%= html_tool_tip(users_with_access_pb.count.to_s + " users") do %> - <% tool_pb, exec_pb = user_can_access_versus, user_can_access_resource %> - <% exec_pb, tool_pb = tool_pb, exec_pb if for_tool %> - - + + <%= html_tool_tip((users_with_access).count, options={:style => {:color => :green}}) do %> + <% admins = users_with_access.select {|u| u.has_role? :admin_user } %> + <%= "of which #{admins.count} are admins".html_safe %> + <% end %> + + user(s) have access, + + <%= html_tool_tip(users_with_access_pb.count ) do %> <%= "#{exec_pb.values.count false} - due Execution Server's project
".html_safe unless exec_pb.values.all? %> <%= "#{tool_pb.values.count false} - due Tool's project
".html_safe unless tool_pb.values.all? %> <% end %> +
+ users have no access <% end %> @@ -170,6 +175,5 @@ -