Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust the tool access reports #1461 #1464

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adjust the tool access reports #1461 #1464

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42c38fc
Adjust the tool access reports #1461
MontrealSergiy Jan 20, 2025
40ccf0a
Replace problem users column with a access summary in the tool acces…
MontrealSergiy Jan 23, 2025
2d5e2ab
minor refactoring with a color helper in the tool access reports #1461
MontrealSergiy Jan 24, 2025
561d220
improve a tooltip verbiage in the tool access reports #1461
MontrealSergiy Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions BrainPortal/app/views/tool_configs/_by_resource.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>

Expand Down Expand Up @@ -149,30 +149,31 @@
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
%>
<%=
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) %>
<span style="color:green">
MontrealSergiy marked this conversation as resolved.
Show resolved Hide resolved
<%= 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 %>
<% end %>
</span>
user(s) have access,
<span class="warning">
<%= html_tool_tip(users_with_access_pb.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<br/>".html_safe unless tool_pb.values.all? %>
<% end %>
</span>
users have no access
</td>
</tr>
<% end %>
<% end %>

</table>


</fieldset>