scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 00:24:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove caching from user access modals [SCI-6163] (#3600)

Browse source
This commit is contained in:
artoscinote 2021-10-22 10:03:52 +02:00 • committed by GitHub
parent 35eb7bffdd
commit 0c8614c9ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,9 +13,6 @@
</p> </p>
<hr /> <hr />
<% users.each do |user| %> <% 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', <%= render partial: 'access_permissions/partials/experiment_member_field',
locals: { locals: {
user: user, user: user,
@ -24,7 +21,6 @@
update_path: access_permissions_project_experiment_path(project, experiment) update_path: access_permissions_project_experiment_path(project, experiment)
} %> } %>
<% end %> <% end %>
<% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button> <button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button>

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

@ -10,11 +10,8 @@
<div class="modal-body"> <div class="modal-body">
<% users.each do |user| %> <% users.each do |user| %>
<% user_assignment = experiment.user_assignments.find_by(user: 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 } %> <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
<% end %> <% end %>
<% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button> <button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button>

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

@ -13,9 +13,6 @@
</p> </p>
<hr /> <hr />
<% users.each do |user| %> <% 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', <%= render partial: 'access_permissions/partials/my_module_member_field',
locals: { locals: {
user: user, user: user,
@ -25,7 +22,6 @@
update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module) update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module)
} %> } %>
<% end %> <% end %>
<% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button> <button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button>

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

@ -10,11 +10,8 @@
<div class="modal-body"> <div class="modal-body">
<% users.each do |user| %> <% users.each do |user| %>
<% user_assignment = my_module.user_assignments.find_by(user: 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 } %> <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
<% end %> <% end %>
<% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button> <button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button>

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

@ -9,10 +9,8 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<% resource.user_assignments.each do |user_assignment| %> <% 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 } %> <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user_assignment.user, resource: resource } %>
<% end %> <% end %>
<% end %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<% if can_manage_resource %> <% if can_manage_resource %>