From 09440d4f83232d76c408ac9fdd394ed89c1b5de3 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 24 Oct 2022 12:57:08 +0200
Subject: [PATCH] Fix display of user access for experiments and tasks
 [SCI-7375]

---
 .../access_permissions/experiments/show.json.jbuilder     | 2 +-
 .../access_permissions/my_modules/show.json.jbuilder      | 2 +-
 .../partials/_default_public_user_role_form.html.erb      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/access_permissions/experiments/show.json.jbuilder b/app/views/access_permissions/experiments/show.json.jbuilder
index 2f0ca2f7c..a43df295e 100644
--- a/app/views/access_permissions/experiments/show.json.jbuilder
+++ b/app/views/access_permissions/experiments/show.json.jbuilder
@@ -5,7 +5,7 @@ json.modal controller.render_to_string(
   formats: [:html],
   locals: {
     experiment: @experiment,
-    users: @experiment.users,
+    users: @experiment.manually_assigned_users,
     project_path: project_path(@project)
   },
   layout: false
diff --git a/app/views/access_permissions/my_modules/show.json.jbuilder b/app/views/access_permissions/my_modules/show.json.jbuilder
index 5e4467b70..30ccb5df5 100644
--- a/app/views/access_permissions/my_modules/show.json.jbuilder
+++ b/app/views/access_permissions/my_modules/show.json.jbuilder
@@ -6,7 +6,7 @@ json.modal controller.render_to_string(
   locals: {
     my_module: @my_module,
     experiment: @experiment,
-    users: @my_module.users
+    users: @my_module.manually_assigned_users
   },
   layout: false
 )
diff --git a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
index 3c57057b1..1e13d77b8 100644
--- a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
+++ b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
@@ -4,11 +4,11 @@
       <%= image_tag "icon/team.png", class: 'img-circle pull-left' %>
     </div>
     <div>
-      <%= t('access_permissions.everyone_else', team_name: f.object.team.name) %>
-      <%= render 'access_permissions/partials/public_members_dropdown', team: f.object.team, project: project %>
+      <%= t('access_permissions.everyone_else', team_name: project.team.name) %>
+      <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, project: project %>
       <br>
       <small class="text-muted">
-        <%= f.object.default_public_user_role.name %>
+        <%= project.default_public_user_role.name %>
         <span class="permission-object-tag" title="<%= t("access_permissions.partials.project_tooltip") %>"">
           <%= t("access_permissions.partials.project") %>
         </span>
@@ -18,7 +18,7 @@
   <div class="user-assignment-controls">
     <div class="user-assignment-role">
       <% if editable %>
-        <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: f.object.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
+        <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: project.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
       <% end %>
     </div>
     <div class="user-assignment-remove">