diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 18b15d840b..2227b2c2cf 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -21,7 +21,7 @@ <% end %> -

<%=l(:label_overview)%>

+

<%=l(:label_overview)%> <% if @project.is_public %><%= l(:field_is_public) %><% end %>

<% unless @project.active? %>

<%= l(:text_project_closed) %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fca5f56475..6dd8cda857 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1462,6 +1462,10 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container { color: #fff; border: 1px solid #d22; } +.badge-project-public { + color: #205D86; + border: 1px solid #205D86; +} .badge-count { color: #fff; background:#9DB9D5; diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 2c3cb2968e..a0d0c9c711 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -673,6 +673,25 @@ class ProjectsControllerTest < Redmine::ControllerTest assert_select '#main.nosidebar' end + def test_show_should_display_project_public_badge_if_project_is_public + p = Project.find('ecookbook') + assert p.is_public? + + get(:show, params: {id: p.identifier}) + assert_response :success + assert_select '.badge.badge-project-public', text: l(:field_is_public) + end + + def test_show_should_not_display_project_public_badge_if_project_is_private + @request.session[:user_id] = 1 + p = Project.find('private-child') + assert_not p.is_public? + + get(:show, params: {id: p.identifier}) + assert_response :success + assert_select '.badge.badge-project-public', count: 0 + end + def test_show_should_display_visible_custom_fields ProjectCustomField.find_by_name('Development status').update_attribute :visible, true get(:show, :params => {:id => 'ecookbook'})