scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-02 18:53:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from aignatov-bio/ai-sci-6325-user-sorting-in-assign-modals

Browse source 
Add A-Z sort for assignment modals [SCI-6325]
This commit is contained in:
Alex Kriuchykhin 2022-01-25 12:59:15 +01:00 committed by GitHub
commit 4a86a0ee45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions

2
app/views/access_permissions/experiments/modals/_edit_modal.html.erb
View file

@ -12,7 +12,7 @@
<%= t '.description' %>
</p>
<hr />
<% users.each do |user| %>
<% users.order(full_name: :asc).each do |user| %>
<%= render partial: 'access_permissions/partials/experiment_member_field',
locals: {
user: user,

2
app/views/access_permissions/experiments/modals/_show_modal.html.erb
View file

@ -8,7 +8,7 @@
<h4 class="modal-title"><%= t '.title', resource_name: experiment.name %></h4>
</div>
<div class="modal-body">
<% users.each do |user| %>
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = experiment.user_assignments.find_by(user: user) %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
<% end %>

2
app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
View file

@ -12,7 +12,7 @@
<%= t '.description' %>
</p>
<hr />
<% users.each do |user| %>
<% users.order(full_name: :asc).each do |user| %>
<%= render partial: 'access_permissions/partials/my_module_member_field',
locals: {
user: user,

2
app/views/access_permissions/my_modules/modals/_show_modal.html.erb
View file

@ -8,7 +8,7 @@
<h4 class="modal-title"><%= t '.title', resource_name: my_module.name %></h4>
</div>
<div class="modal-body">
<% users.each do |user| %>
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = my_module.user_assignments.find_by(user: user) %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
<% end %>

2
app/views/access_permissions/partials/_edit_assignments_content.html.erb
View file

@ -6,7 +6,7 @@
<h4 class="modal-title"><%= t '.title', resource_name: project.name %></h4>
</div>
<div class="modal-body">
<% project.manually_assigned_users.each do |user| %>
<% project.manually_assigned_users.order(full_name: :asc).each do |user| %>
<%= render('access_permissions/partials/project_member_field', user: user, project: project, update_path: update_path) %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: true) if project.visible? %>

2
app/views/access_permissions/projects/modals/_show_modal.html.erb
View file

@ -8,7 +8,7 @@
<h4 class="modal-title"><%= t '.title', resource_name: resource.name %></h4>
</div>
<div class="modal-body">
<% resource.user_assignments.each do |user_assignment| %>
<% resource.user_assignments.joins(:user).order('users.full_name': :asc).each do |user_assignment| %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user_assignment.user, resource: resource } %>
<% end %>
</div>