From b9df85869cabc4b8267be88f31b9918cdbd87844 Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Fri, 18 Feb 2022 10:19:13 +0100
Subject: [PATCH] View access modal fixes [SCI-6480] (#3870)

---
 .../experiments/modals/_show_modal.html.erb   |  2 +-
 .../my_modules/modals/_show_modal.html.erb    |  3 ++-
 .../partials/_user_assignment.html.erb        | 19 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

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 9d6898a79..ad440f7a7 100644
--- a/app/views/access_permissions/experiments/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
@@ -12,7 +12,7 @@
           <% 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 %>
-        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
+        <%= render('access_permissions/partials/default_public_user_role_form', project: experiment.project, editable: false) if experiment.project.visible? %>
       </div>
     </div>
   </div>
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 f596a0356..686086a3d 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
@@ -12,7 +12,8 @@
           <% 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 %>
-        <%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
+        <%= render('access_permissions/partials/default_public_user_role_form',
+                   project: my_module.experiment.project, editable: false) if my_module.experiment.project.visible? %>
       </div>
     </div>
   </div>
diff --git a/app/views/access_permissions/partials/_user_assignment.html.erb b/app/views/access_permissions/partials/_user_assignment.html.erb
index 7574dea1e..cda784616 100644
--- a/app/views/access_permissions/partials/_user_assignment.html.erb
+++ b/app/views/access_permissions/partials/_user_assignment.html.erb
@@ -1,15 +1,14 @@
 <% # frozen_string_literal: true %>
 
 <div class="row member-item">
-  <div class="col-xs-2">
-  <span class="global-avatar-container">
-    <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
-  </span>
-  </div>
-
-  <div class="col-xs-10">
-    <span><%= current_assignee_name(user) %></span>
-    <br>
-    <small class="text-muted"><%= user_assignment_resource_role_name(user, resource) %></small>
+  <div class="user-assignment-info">
+    <div class="global-avatar-container">
+      <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
+    </div>
+    <div>
+      <%= current_assignee_name(user) %>
+      <br>
+      <small class="text-muted"><%= user_assignment_resource_role_name(user, resource) %></small>
+    </div>
   </div>
 </div>