diff --git a/BrainPortal/app/views/tool_configs/_by_resource.erb b/BrainPortal/app/views/tool_configs/_by_resource.erb
index fad1f0d52..67740af8d 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) |
+ Users Access Summary |
<% end %>
@@ -145,27 +145,27 @@
<%
- # An array with each user with problem access
- users_with_access_pb = users.select do |user|
+ # An array of user without access
+ users_without_access = 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_without_access
%>
- <%=
- array_to_table(users_with_access_pb,
- :rows => 1,
- :table_class => 'simple',
- :td_class => 'warning'
- ) do |user,r,c|
- %>
+ <% 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(user.login) do %>
- <%= "* Execution Server's project ".html_safe unless
- ( for_tool ? user_can_access_versus[user] : user_can_access_resource[user] ) %>
- <%= "* Tool's project ".html_safe unless
- ( for_tool ? user_can_access_resource[user] : user_can_access_versus[user] ) %>
- <%= "* Version configuration's project ".html_safe unless tc.can_be_accessed_by?(user) %>
+ <%= html_tool_tip html_colorize(users_with_access.count, "green") do %>
+ <% admins = users_with_access.select {|u| u.has_role? :admin_user } %>
+ <%= "of which #{admins.count} are admins".html_safe %>
<% end %>
- <% end %>
+ user(s) have access,
+
+ <%= html_tool_tip html_colorize users_without_access.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 %>
+
+ user(s) have no access
|
<% end %>
@@ -173,6 +173,5 @@
-