Skip to content

Consistent ordering of roles on the project roles admin page #2731

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

Merged
stuzart merged 3 commits into from
Sep 2, 2026
Merged

Consistent ordering of roles on the project roles admin page #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ba3b8e
Consistent ordering of roles on the project roles admin page (#2727)
stuzart Aug 27, 2026
3160820
Move PALs to the end of the role lists (#2727)
stuzart Aug 27, 2026
f9d63a2
Remove the unused project coordinators code
stuzart Aug 27, 2026
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
4 changes: 0 additions & 4 deletions app/helpers/projects_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ def gatekeepers_link_list(project)
link_list_for_role(t('asset_gatekeeper'), project.asset_gatekeepers)
end

def project_coordinators_link_list(project)
link_list_for_role('Project coordinator', project.project_coordinators)
end

def programme_link(project)
html = if project.try(:programme).nil?
"<span class='none_text'>This #{t('project')} is not associated with a #{t('programme')}</span>"
Expand Down
6 changes: 3 additions & 3 deletions app/views/projects/admin_member_roles.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<%= label_tag("#{t('project_administrator').pluralize}") %>
<%= project_administrators_input_box(@project) %>

<%= label_tag("#{t('asset_gatekeeper').pluralize}") %>
<%= project_asset_gatekeepers_input_box(@project) %>

<%= label_tag("#{t('asset_housekeeper').pluralize}") %>
<%= project_asset_housekeepers_input_box(@project) %>

<%= label_tag("#{t('asset_gatekeeper').pluralize}") %>
<%= project_asset_gatekeepers_input_box(@project) %>

<% if admin_logged_in? %>
<label><%= "#{t('pal').pluralize}" %></label>
<%= project_pals_input_box(@project) %>
Expand Down
17 changes: 5 additions & 12 deletions app/views/projects/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@
</div>

<div class="col-md-6">
<p class="pals">
<strong><%= Seek::Config.instance_admins_name %> <%= t('pal').pluralize %>:</strong>
<%= pals_link_list @project -%>
</p>

<% if @project.respond_to?(:project_coordinators) %>
<p class="project_coordinators">
<strong>Project Coordinators:</strong>
<%= project_coordinators_link_list @project %>
</p>
<% end%>

<% if logged_in_and_registered? %>
<p class="project_administrators">
<strong><%= t('project_administrator').pluralize %>:</strong>
Expand All @@ -80,6 +68,11 @@
<%= gatekeepers_link_list @project %>
</p>
<% end %>

<p class="pals">
<strong><%= Seek::Config.instance_admins_name %> <%= t('pal').pluralize %>:</strong>
<%= pals_link_list @project -%>
</p>
<p>
<% if @project.start_date %>
<strong><%= t('project') -%> start date:</strong>
Expand Down
Loading