diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2024-02-27 07:21:54 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2024-02-27 07:21:54 +0000 |
| commit | 5a847b7e1490577cd46ca77b1ab2861bff8001a8 (patch) | |
| tree | c94e5428e19209bdce79529e6a11a8d2dce967e3 /app/views | |
| parent | b055a93e5bde875f12157bda69b5e0b620543f10 (diff) | |
| download | redmine-5a847b7e1490577cd46ca77b1ab2861bff8001a8.tar.gz redmine-5a847b7e1490577cd46ca77b1ab2861bff8001a8.zip | |
Merged r22739 and r22745 from trunk to 5.0-stable (#39995).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22749 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/activities/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/versions/_sidebar.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index cb0bef9dc..e5176d859 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -50,7 +50,7 @@ </li> <% end %> </ul> -<% if @project && @project.descendants.active.any? %> +<% if @project && @project.descendants.visible.any? %> <%= hidden_field_tag 'with_subprojects', 0, :id => nil %> <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <% end %> diff --git a/app/views/versions/_sidebar.html.erb b/app/views/versions/_sidebar.html.erb index aecb7d131..0ce93fe82 100644 --- a/app/views/versions/_sidebar.html.erb +++ b/app/views/versions/_sidebar.html.erb @@ -20,7 +20,7 @@ <%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %> </label> </li> - <% if @project.descendants.active.any? %> + <% if @project.descendants.allowed_to(:view_issues).any? %> <li> <%= hidden_field_tag 'with_subprojects', 0, :id => nil %> <label> |