From 45d7718572657403309a34aba47d1d8a5cfa5b0a Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 10 Jan 2022 14:55:11 +0100
Subject: [PATCH 1/2] Add A-Z sort for assignment modals [SCI-6325]

---
 .../access_permissions/experiments/modals/_edit_modal.html.erb  | 2 +-
 .../access_permissions/experiments/modals/_show_modal.html.erb  | 2 +-
 .../access_permissions/my_modules/modals/_edit_modal.html.erb   | 2 +-
 .../access_permissions/my_modules/modals/_show_modal.html.erb   | 2 +-
 .../partials/_edit_assignments_content.html.erb                 | 2 +-
 .../access_permissions/projects/modals/_show_modal.html.erb     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/access_permissions/experiments/modals/_edit_modal.html.erb b/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
index 49bc960e8..462d88415 100644
--- a/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
@@ -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,
diff --git a/app/views/access_permissions/experiments/modals/_show_modal.html.erb b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
index 940aae9f0..2df07ba35 100644
--- a/app/views/access_permissions/experiments/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
@@ -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 %>
diff --git a/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb b/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
index 33264d659..93762afdc 100644
--- a/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
+++ b/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
@@ -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,
diff --git a/app/views/access_permissions/my_modules/modals/_show_modal.html.erb b/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
index e38ea107a..d8f3f0308 100644
--- a/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
@@ -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 %>
diff --git a/app/views/access_permissions/partials/_edit_assignments_content.html.erb b/app/views/access_permissions/partials/_edit_assignments_content.html.erb
index f3eaef367..59c18abb5 100644
--- a/app/views/access_permissions/partials/_edit_assignments_content.html.erb
+++ b/app/views/access_permissions/partials/_edit_assignments_content.html.erb
@@ -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) if project.visible? %>
diff --git a/app/views/access_permissions/projects/modals/_show_modal.html.erb b/app/views/access_permissions/projects/modals/_show_modal.html.erb
index dc5c407db..c5d9e2609 100644
--- a/app/views/access_permissions/projects/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/projects/modals/_show_modal.html.erb
@@ -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>

From cbcba90a8efe5d7335e982801b88abcf7b22dc65 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 25 Jan 2022 10:10:57 +0100
Subject: [PATCH 2/2] Fix markup [SCI-6325]

---
 .../access_permissions/projects/modals/_show_modal.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/access_permissions/projects/modals/_show_modal.html.erb b/app/views/access_permissions/projects/modals/_show_modal.html.erb
index c5d9e2609..3b8d2c9d0 100644
--- a/app/views/access_permissions/projects/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/projects/modals/_show_modal.html.erb
@@ -8,7 +8,7 @@
         <h4 class="modal-title"><%= t '.title', resource_name: resource.name %></h4>
       </div>
       <div class="modal-body">
-        <% resource.user_assignments.joins(:user).order('users.full_name ASC').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>