Adjust the tool access reports #1461 (#1464)

aces · Mar 3, 2025 · 99e5633 · 99e5633
1 parent d20378b
commit 99e5633
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/BrainPortal/app/views/tool_configs/_by_resource.erb b/BrainPortal/app/views/tool_configs/_by_resource.erb
@@ -97,7 +97,7 @@
         <th><%= for_tool ? "Execution Servers" : "Tools" %> </th>
         <th>Versions Configured</th>
         <th>Projects In Effect</th>
-        <th class="left_align">Users with access problem(s)</th>
+        <th class="left_align">Users Access Summary </th>
       </tr>
     <% end %>
 
@@ -145,34 +145,33 @@
           </td>
           <td class="left_align">
             <%
-              # 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 %>
               <!-- Add information on the tooltip -->
-              <%= html_tool_tip(user.login) do %>
-                <%= "* Execution Server's project<br/>".html_safe      unless
-                  ( for_tool ? user_can_access_versus[user] : user_can_access_resource[user] ) %>
-                <%= "* Tool's project<br/>".html_safe                  unless
-                  ( for_tool ? user_can_access_resource[user] : user_can_access_versus[user] ) %>
-                <%= "* Version configuration's project<br/>".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,
+            <span class="warning">
+              <%= html_tool_tip html_colorize users_without_access.count do %>
+                <%= "#{exec_pb.values.count false} - due Execution Server's project<br/>".html_safe unless exec_pb.values.all?  %>
+                <%= "#{tool_pb.values.count false} - due Tool's project".html_safe unless tool_pb.values.all?  %>
+              <% end %>
+            </span>
+            user(s) have no access
           </td>
         </tr>
       <% end %>
     <% end %>
 
   </table>
 
-
 </fieldset>