From 3350ddde9daecf739e07e244e6caa67be12824ff Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Fri, 29 Sep 2017 11:33:17 +0200 Subject: [PATCH 1/2] Bump VERSION to 7.3.1 --- lib/open_project/my_project_page/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/my_project_page/version.rb b/lib/open_project/my_project_page/version.rb index d3f47e0cbb..801d2c8eb6 100644 --- a/lib/open_project/my_project_page/version.rb +++ b/lib/open_project/my_project_page/version.rb @@ -20,6 +20,6 @@ module OpenProject module MyProjectPage - VERSION = "7.3.0" + VERSION = "7.3.1" end end From 9d2663de8c879feb6ae0f17e8cb9da1ce6813b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Wed, 11 Oct 2017 14:49:18 +0200 Subject: [PATCH 2/2] [26462] Don't show members without permission [ci skip] https://community.openproject.com/wp/26462 --- .../blocks/_members.html.erb | 21 ++++++++++++------- config/locales/en.yml | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/views/my_projects_overviews/blocks/_members.html.erb b/app/views/my_projects_overviews/blocks/_members.html.erb index 006a472bc8..554ba7014b 100644 --- a/app/views/my_projects_overviews/blocks/_members.html.erb +++ b/app/views/my_projects_overviews/blocks/_members.html.erb @@ -28,13 +28,20 @@ See doc/COPYRIGHT.md for more details. <%=t(:label_member_plural)%> -<% if @project.members.count > 0 && users_by_role(50).any? %> -
-

- <%= render partial: "members", - locals: { users_by_role: users_by_role(50), - count_users_by_role: count_users_by_role } %> -

+ +<% if current_user.allowed_to?(:view_members, project) %> + <% if @project.members.count > 0 && users_by_role(50).any? %> +
+

+ <%= render partial: "members", + locals: { users_by_role: users_by_role(50), + count_users_by_role: count_users_by_role } %> +

+
+ <% end %> +<% else %> +
+ <%= t(:label_no_visible_members) %>
<% end %> <% if current_user.allowed_to?(:manage_members, project) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 674afe8f0f..39853bfead 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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: