diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb index 473b1e1e077..80e625e7e3a 100644 --- a/app/views/groups/_memberships.html.erb +++ b/app/views/groups/_memberships.html.erb @@ -27,7 +27,7 @@ See COPYRIGHT and LICENSE files for more details. ++#%> <% roles = ProjectRole.givable %> -<% projects = Project.active.order(Arel.sql('lft')) %> +<% projects = Project.active.order(Arel.sql("lft")) %> <% memberships = @group.memberships %>
@@ -78,7 +78,7 @@ See COPYRIGHT and LICENSE files for more details. - <%= h membership.roles.sort.collect(&:to_s).join(', ') %> + <%= h membership.roles.sort.collect(&:to_s).join(", ") %> <%= labelled_tabular_form_for( :membership, @@ -95,8 +95,7 @@ See COPYRIGHT and LICENSE files for more details. membership.roles.include?(role), role.name, no_label: true, - id: nil - %> + id: nil %> <%= role %> <% end %> @@ -141,25 +140,24 @@ See COPYRIGHT and LICENSE files for more details. <%= label_tag "membership_project_id", t(:description_choose_project), class: "sr-only" %> <% group_project_ids = @group.projects.ids %> - <% filters = [{ name: 'active', operator: '=', values: ['t'] }] %> - <% filters << { name: 'id', operator: '!', values: group_project_ids.map(&:to_s) } if group_project_ids.any? %> - <%= angular_component_tag 'opce-project-autocompleter', + <% filters = [{ name: "active", operator: "=", values: ["t"] }] %> + <% filters << { name: "id", operator: "!", values: group_project_ids.map(&:to_s) } if group_project_ids.any? %> + <%= angular_component_tag "opce-project-autocompleter", inputs: { filters: filters, - inputName: 'membership[project_id]' + inputName: "membership[project_id]" }, data: { - 'test-selector': 'membership_project_id' + "test-selector": "membership_project_id" }, - class: 'form--field' - %> + class: "form--field" %>
<%= styled_label_tag nil, "#{t(:label_role_plural)}:" %>
- <%= labeled_check_box_tags 'membership[role_ids][]', roles %> + <%= labeled_check_box_tags "membership[role_ids][]", roles %>
-
<%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %>
+
<%= styled_button_tag t(:button_add), class: "-primary -with-icon icon-checkmark" %>
<% end %> <% end %> diff --git a/app/views/individual_principals/_memberships.html.erb b/app/views/individual_principals/_memberships.html.erb index d7a5e5afbb1..91baa69d00a 100644 --- a/app/views/individual_principals/_memberships.html.erb +++ b/app/views/individual_principals/_memberships.html.erb @@ -30,120 +30,121 @@ See COPYRIGHT and LICENSE files for more details. <% projects = ::Members::CreateContract .new(@individual_principal.memberships.build, current_user) .assignable_projects - .order(Arel.sql('lft')) %> + .order(Arel.sql("lft")) %> <% memberships = @individual_principal.memberships.where(id: Member.visible(current_user)) %>
- <% if memberships.any? %> -
-
- - - - - <%= call_individual_principals_memberships_hook(@individual_principal, 'colgroup') %> - - - - - - - <%= call_individual_principals_memberships_hook(@individual_principal, 'header') %> - - - - - <% memberships.where.not(project: nil).each do |membership| %> - <% next if membership.new_record? %> - - - + <% memberships.where.not(project: nil).each do |membership| %> + <% next if membership.new_record? %> + + + + <%= call_individual_principals_memberships_hook( + @individual_principal, + "row", + membership: membership, + roles: roles, + projects: projects + ) %> + + + <% end %> + +
-
-
- - <%= Project.model_name.human %> - -
-
-
-
-
- - <%= t(:label_role_plural) %> - -
-
-
- <%= link_to_project membership.project %> - - - <%=h membership.roles.sort.collect(&:to_s).join(', ') %> - - <%= labelled_tabular_form_for( - :membership, - url: polymorphic_path([@individual_principal, :membership], id: membership), - method: :patch, - id: "member-#{membership.id}-roles-form", - data: { reveal_target: "item" }, - html: { class: "d-none member-#{membership.id}--edit-toggle-item" } - ) do |f| %> -
- <% roles.each do |role| %> - - <% end %> + <% if memberships.any? %> +
+
+ + + + + <%= call_individual_principals_memberships_hook(@individual_principal, "colgroup") %> + + + + + + + + + <%= call_individual_principals_memberships_hook(@individual_principal, "header") %> + - <% end %> - -
+
+
+ + <%= Project.model_name.human %> +
-

- <%= submit_tag t(:button_change), class: "memberships--edit-submit-button button -primary -small" %> - <%= button_tag t(:button_cancel), type: "button", - data: { action: "reveal#toggle" }, - class: "button -small" %> -

- <% end %> - - <%= call_individual_principals_memberships_hook(@individual_principal, - 'row', - membership: membership, - roles: roles, - projects: projects) %> -
- <% if User.current.allowed_in_project?(:manage_members, membership.project) %> - <%= link_to( - icon_wrapper("icon icon-edit", t(:button_edit)), - "#", - class: "member-#{membership.id}--edit-toggle-item memberships--edit-button", - data: { action: "reveal#toggle", reveal_target: "item" }, - aria: { label: t(:button_edit) } - ) %> - <%= if membership.deletable? - link_to( - icon_wrapper("icon icon-remove", t(:button_remove)), - polymorphic_path([@individual_principal, :membership], id: membership), - data: { turbo_method: :delete }, - aria: { label: t(:button_remove) } - ) - end %> - <% end %> - +
+
+ + <%= t(:label_role_plural) %> + +
+
+
+ +
+ <%= link_to_project membership.project %> + + + <%= h membership.roles.sort.collect(&:to_s).join(", ") %> + + <%= labelled_tabular_form_for( + :membership, + url: polymorphic_path([@individual_principal, :membership], id: membership), + method: :patch, + id: "member-#{membership.id}-roles-form", + data: { reveal_target: "item" }, + html: { class: "d-none member-#{membership.id}--edit-toggle-item" } + ) do |f| %> +
+ <% roles.each do |role| %> + + <% end %> +
+

+ <%= submit_tag t(:button_change), class: "memberships--edit-submit-button button -primary -small" %> + <%= button_tag t(:button_cancel), type: "button", + data: { action: "reveal#toggle" }, + class: "button -small" %> +

+ <% end %> +
+ <% if User.current.allowed_in_project?(:manage_members, membership.project) %> + <%= link_to( + icon_wrapper("icon icon-edit", t(:button_edit)), + "#", + class: "member-#{membership.id}--edit-toggle-item memberships--edit-button", + data: { action: "reveal#toggle", reveal_target: "item" }, + aria: { label: t(:button_edit) } + ) %> + <%= if membership.deletable? + link_to( + icon_wrapper("icon icon-remove", t(:button_remove)), + polymorphic_path([@individual_principal, :membership], id: membership), + data: { turbo_method: :delete }, + aria: { label: t(:button_remove) } + ) + end %> + <% end %> +
<% else %> @@ -152,31 +153,32 @@ See COPYRIGHT and LICENSE files for more details.
<% if projects.any? %> - <%= labelled_tabular_form_for(:membership, - url: polymorphic_path([@individual_principal, :memberships]), - html: {id: "new_project_membership"}) do %> + <%= labelled_tabular_form_for( + :membership, + url: polymorphic_path([@individual_principal, :memberships]), + html: { id: "new_project_membership" } + ) do %>
- <%=t(:label_available_projects)%> - <% principal_project_ids = @individual_principal.projects.ids %> - <% filter = [{ name: 'active', operator: '=', values: ['t'] }] %> - <% filter << { name: 'id', operator: '!', values: principal_project_ids.map(&:to_s)} if principal_project_ids.any? %> - <%= angular_component_tag 'opce-project-autocompleter', + <%= t(:label_available_projects) %> + <% principal_project_ids = @individual_principal.projects.ids %> + <% filter = [{ name: "active", operator: "=", values: ["t"] }] %> + <% filter << { name: "id", operator: "!", values: principal_project_ids.map(&:to_s) } if principal_project_ids.any? %> + <%= angular_component_tag "opce-project-autocompleter", inputs: { filters: filter, - inputName: 'membership[project_id]' + inputName: "membership[project_id]" }, data: { - 'test-selector': 'membership_project_id' + "test-selector": "membership_project_id" }, - class: 'form--field' - %> + class: "form--field" %>
<%= styled_label_tag nil, "#{t(:label_role_plural)}:" %>
- <%= labeled_check_box_tags 'membership[role_ids][]', roles %> + <%= labeled_check_box_tags "membership[role_ids][]", roles %>
-
<%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %>
+
<%= styled_button_tag t(:button_add), class: "-primary -with-icon icon-checkmark" %>
<% end %> <% end %>