Merge remote-tracking branch 'origin/release/7.3' into dev

pull/6827/head
Oliver Günther 7 years ago
commit feea7f7b70
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 21
      app/views/my_projects_overviews/blocks/_members.html.erb
  2. 1
      config/locales/en.yml

@ -28,13 +28,20 @@ See doc/COPYRIGHT.md for more details.
<span class="widget-box--header-title"><%=t(:label_member_plural)%></span>
</h3>
<% if @project.members.count > 0 && users_by_role(50).any? %>
<div class="members overview" id="users_per_role">
<p>
<%= render partial: "members",
locals: { users_by_role: users_by_role(50),
count_users_by_role: count_users_by_role } %>
</p>
<% if current_user.allowed_to?(:view_members, project) %>
<% if @project.members.count > 0 && users_by_role(50).any? %>
<div class="members overview" id="users_per_role">
<p>
<%= render partial: "members",
locals: { users_by_role: users_by_role(50),
count_users_by_role: count_users_by_role } %>
</p>
</div>
<% end %>
<% else %>
<div class="members overview">
<%= t(:label_no_visible_members) %>
</div>
<% end %>
<% if current_user.allowed_to?(:manage_members, project) %>

@ -36,6 +36,7 @@ en:
label_work_package_tracking: " Work package tracking"
label_members: "Members"
label_member_view_all: "View all members"
label_no_visible_members: "This project has no visible members."
label_subprojects: "Subprojects"
project_page:

Loading…
Cancel
Save