From 0c8614c9ace1cdd08924ce6094edf3193ee892e1 Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Fri, 22 Oct 2021 10:03:52 +0200
Subject: [PATCH] Remove caching from user access modals [SCI-6163] (#3600)

---
 .../experiments/modals/_edit_modal.html.erb   | 18 +++++++----------
 .../experiments/modals/_show_modal.html.erb   |  5 +----
 .../my_modules/modals/_edit_modal.html.erb    | 20 ++++++++-----------
 .../my_modules/modals/_show_modal.html.erb    |  5 +----
 .../projects/modals/_show_modal.html.erb      |  4 +---
 5 files changed, 18 insertions(+), 34 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 1940f7dbb..8b68f3aa0 100644
--- a/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
@@ -13,17 +13,13 @@
         </p>
         <hr />
         <% users.each do |user| %>
-          <% user_assignment = experiment.user_assignments.find_by(user: user) %>
-
-          <% cache [user_assignment, experiment, user, current_user] do %>
-            <%= render partial: 'access_permissions/partials/experiment_member_field',
-                       locals: {
-                         user: user,
-                         project: project,
-                         experiment: experiment,
-                         update_path: access_permissions_project_experiment_path(project, experiment)
-                       } %>
-          <% end %>
+          <%= render partial: 'access_permissions/partials/experiment_member_field',
+                      locals: {
+                        user: user,
+                        project: project,
+                        experiment: experiment,
+                        update_path: access_permissions_project_experiment_path(project, experiment)
+                      } %>
         <% end %>
       </div>
       <div class="modal-footer">
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 623a8455b..c5f63041a 100644
--- a/app/views/access_permissions/experiments/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
@@ -10,10 +10,7 @@
       <div class="modal-body">
         <% users.each do |user| %>
           <% user_assignment = experiment.user_assignments.find_by(user: user) %>
-
-          <% cache [user_assignment, experiment, current_user, user] do %>
-            <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
-          <% end %>
+          <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
         <% end %>
       </div>
       <div class="modal-footer">
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 954bde4d7..a8b4c3272 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
@@ -13,18 +13,14 @@
         </p>
         <hr />
         <% users.each do |user| %>
-          <% user_assignment = my_module.user_assignments.find_by(user: user) %>
-
-          <% cache [user_assignment, my_module, user, current_user] do %>
-            <%= render partial: 'access_permissions/partials/my_module_member_field',
-                       locals: {
-                         user: user,
-                         project: project,
-                         experiment: experiment,
-                         my_module: my_module,
-                         update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module)
-                       } %>
-          <% end %>
+          <%= render partial: 'access_permissions/partials/my_module_member_field',
+                      locals: {
+                        user: user,
+                        project: project,
+                        experiment: experiment,
+                        my_module: my_module,
+                        update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module)
+                      } %>
         <% end %>
       </div>
       <div class="modal-footer">
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 799daa2ae..67a480174 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
@@ -10,10 +10,7 @@
       <div class="modal-body">
         <% users.each do |user| %>
           <% user_assignment = my_module.user_assignments.find_by(user: user) %>
-
-          <% cache [user_assignment, my_module, current_user, user] do %>
-            <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
-          <% end %>
+          <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
         <% end %>
       </div>
       <div class="modal-footer">
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 e0d245701..fb3bbee15 100644
--- a/app/views/access_permissions/projects/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/projects/modals/_show_modal.html.erb
@@ -9,9 +9,7 @@
       </div>
       <div class="modal-body">
         <% resource.user_assignments.each do |user_assignment| %>
-          <% cache [user_assignment, resource, current_user, user_assignment.user] do %>
-            <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user_assignment.user, resource: resource } %>
-          <% end %>
+          <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user_assignment.user, resource: resource } %>
         <% end %>
       </div>
       <div class="modal-footer">