mirror of
https://github.com/opf/openproject.git
synced 2026-06-13 19:20:00 +00:00
Autocorrect ERB Lint errors, fix indenting
This commit is contained in:
Alexander Brandon Coles
@@ -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 %>
|
||||
|
||||
<div class="grid-block grid-block_visible-overflow">
|
||||
@@ -78,7 +78,7 @@ See COPYRIGHT and LICENSE files for more details.
|
||||
</td>
|
||||
<td class="roles">
|
||||
<span id="member-<%= membership.id %>-roles" data-reveal-target="item">
|
||||
<%= h membership.roles.sort.collect(&:to_s).join(', ') %>
|
||||
<%= h membership.roles.sort.collect(&:to_s).join(", ") %>
|
||||
</span>
|
||||
<%= 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 %>
|
||||
</label>
|
||||
<% 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" %>
|
||||
<div class="form--field -vertical">
|
||||
<%= styled_label_tag nil, "#{t(:label_role_plural)}:" %>
|
||||
<div class="form--field-container -vertical">
|
||||
<%= labeled_check_box_tags 'membership[role_ids][]', roles %>
|
||||
<%= labeled_check_box_tags "membership[role_ids][]", roles %>
|
||||
</div>
|
||||
</div>
|
||||
<div><%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %></div>
|
||||
<div><%= styled_button_tag t(:button_add), class: "-primary -with-icon icon-checkmark" %></div>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -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)) %>
|
||||
|
||||
<div class="grid-block grid-block_visible-overflow">
|
||||
<div class="grid-content">
|
||||
<% if memberships.any? %>
|
||||
<div class="generic-table--container">
|
||||
<div class="generic-table--results-container">
|
||||
<table class="generic-table memberships">
|
||||
<colgroup>
|
||||
<col>
|
||||
<col>
|
||||
<%= call_individual_principals_memberships_hook(@individual_principal, 'colgroup') %>
|
||||
<col>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<div class="generic-table--sort-header-outer">
|
||||
<div class="generic-table--sort-header">
|
||||
<span>
|
||||
<%= Project.model_name.human %>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<th>
|
||||
<div class="generic-table--sort-header-outer">
|
||||
<div class="generic-table--sort-header">
|
||||
<span>
|
||||
<%= t(:label_role_plural) %>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<%= call_individual_principals_memberships_hook(@individual_principal, 'header') %>
|
||||
<th><div class="generic-table--empty-header"></div></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% memberships.where.not(project: nil).each do |membership| %>
|
||||
<% next if membership.new_record? %>
|
||||
<tr id="member-<%= membership.id %>"
|
||||
class="member"
|
||||
data-controller="reveal"
|
||||
data-reveal-hidden-class="d-none">
|
||||
<td class="project">
|
||||
<%= link_to_project membership.project %>
|
||||
</td>
|
||||
<td class="roles">
|
||||
<span id="member-<%= membership.id %>-roles"
|
||||
class="member-<%= membership.id %>--edit-toggle-item"
|
||||
data-reveal-target="item">
|
||||
<%=h membership.roles.sort.collect(&:to_s).join(', ') %>
|
||||
</span>
|
||||
<%= 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| %>
|
||||
<div>
|
||||
<% roles.each do |role| %>
|
||||
<label class="form--label-with-check-box">
|
||||
<%= f.collection_check_box :role_ids,
|
||||
role.id,
|
||||
membership.roles.include?(role),
|
||||
role.name,
|
||||
disabled: membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?},
|
||||
no_label: true,
|
||||
id: nil
|
||||
%>
|
||||
<%= role %>
|
||||
</label>
|
||||
<% end %>
|
||||
<% if memberships.any? %>
|
||||
<div class="generic-table--container">
|
||||
<div class="generic-table--results-container">
|
||||
<table class="generic-table memberships">
|
||||
<colgroup>
|
||||
<col>
|
||||
<col>
|
||||
<%= call_individual_principals_memberships_hook(@individual_principal, "colgroup") %>
|
||||
<col>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<div class="generic-table--sort-header-outer">
|
||||
<div class="generic-table--sort-header">
|
||||
<span>
|
||||
<%= Project.model_name.human %>
|
||||
</span>
|
||||
</div>
|
||||
<p>
|
||||
<%= 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" %>
|
||||
</p>
|
||||
<% end %>
|
||||
</td>
|
||||
<%= call_individual_principals_memberships_hook(@individual_principal,
|
||||
'row',
|
||||
membership: membership,
|
||||
roles: roles,
|
||||
projects: projects) %>
|
||||
<td class="buttons">
|
||||
<% 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 %>
|
||||
</td>
|
||||
</div>
|
||||
</th>
|
||||
<th>
|
||||
<div class="generic-table--sort-header-outer">
|
||||
<div class="generic-table--sort-header">
|
||||
<span>
|
||||
<%= t(:label_role_plural) %>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<%= call_individual_principals_memberships_hook(@individual_principal, "header") %>
|
||||
<th><div class="generic-table--empty-header"></div></th>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% memberships.where.not(project: nil).each do |membership| %>
|
||||
<% next if membership.new_record? %>
|
||||
<tr id="member-<%= membership.id %>"
|
||||
class="member"
|
||||
data-controller="reveal"
|
||||
data-reveal-hidden-class="d-none">
|
||||
<td class="project">
|
||||
<%= link_to_project membership.project %>
|
||||
</td>
|
||||
<td class="roles">
|
||||
<span id="member-<%= membership.id %>-roles"
|
||||
class="member-<%= membership.id %>--edit-toggle-item"
|
||||
data-reveal-target="item">
|
||||
<%= h membership.roles.sort.collect(&:to_s).join(", ") %>
|
||||
</span>
|
||||
<%= 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| %>
|
||||
<div>
|
||||
<% roles.each do |role| %>
|
||||
<label class="form--label-with-check-box">
|
||||
<%= f.collection_check_box :role_ids,
|
||||
role.id,
|
||||
membership.roles.include?(role),
|
||||
role.name,
|
||||
disabled: membership.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? },
|
||||
no_label: true,
|
||||
id: nil %>
|
||||
<%= role %>
|
||||
</label>
|
||||
<% end %>
|
||||
</div>
|
||||
<p>
|
||||
<%= 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" %>
|
||||
</p>
|
||||
<% end %>
|
||||
</td>
|
||||
<%= call_individual_principals_memberships_hook(
|
||||
@individual_principal,
|
||||
"row",
|
||||
membership: membership,
|
||||
roles: roles,
|
||||
projects: projects
|
||||
) %>
|
||||
<td class="buttons">
|
||||
<% 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 %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<% else %>
|
||||
@@ -152,31 +153,32 @@ See COPYRIGHT and LICENSE files for more details.
|
||||
</div>
|
||||
<div class="grid-content">
|
||||
<% 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 %>
|
||||
<fieldset class="form--fieldset">
|
||||
<legend class="form--fieldset-legend"><%=t(:label_available_projects)%></legend>
|
||||
<% 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',
|
||||
<legend class="form--fieldset-legend"><%= t(:label_available_projects) %></legend>
|
||||
<% 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" %>
|
||||
<div class="form--field -vertical">
|
||||
<%= styled_label_tag nil, "#{t(:label_role_plural)}:" %>
|
||||
<div class="form--field-container -vertical">
|
||||
<%= labeled_check_box_tags 'membership[role_ids][]', roles %>
|
||||
<%= labeled_check_box_tags "membership[role_ids][]", roles %>
|
||||
</div>
|
||||
</div>
|
||||
<div><%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %></div>
|
||||
<div><%= styled_button_tag t(:button_add), class: "-primary -with-icon icon-checkmark" %></div>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user