Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/views/projects/_members_box.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,12 @@
<% @principals_by_role.keys.sort.each do |role| %>
<p><span class="label"><%= role %>:</span> <%= @principals_by_role[role].sort.collect{|p| link_to_principal(p, :class => p.is_a?(Group) ? 'icon icon-group' : nil)}.join(", ").html_safe %></p>
<% end %>
<% if @project.is_public %>
<hr>
<div id="is-public-project-notice">
<p span class="label"><%= l(:field_is_public) %>:</span> <%= l(:general_text_Yes) %>
<em class="info"><%= Setting.login_required? ? l(:text_project_is_public_non_member) : l(:text_project_is_public_anonymous) %></em>
</div>
<% end -%>
</div>
<% end %>
2 changes: 1 addition & 1 deletion app/views/projects/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<% end %>
</div>

<h2><%=l(:label_overview)%></h2>
<h2><%=l(:label_overview)%> <% if @project.is_public %><span class="badge badge-project-public"><%= l(:field_is_public) %></span><% end %></h2>

<% unless @project.active? %>
<p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
Expand Down
4 changes: 4 additions & 0 deletions public/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -1467,6 +1467,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;
Expand Down
46 changes: 46 additions & 0 deletions test/functional/projects_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,52 @@ def test_show_should_not_display_empty_sidebar
assert_select '#main.nosidebar'
end

def test_show_should_display_is_public_project_notice
p = Project.find('ecookbook')
assert p.is_public?

with_settings :login_required => '0' do
get(:show, :params => {:id => p.identifier})
assert_response :success
assert_select '#is-public-project-notice .info', :text => l(:text_project_is_public_anonymous)
end

with_settings :login_required => '1' do
@request.session[:user_id] = 1
get(:show, :params => {:id => p.identifier})
assert_response :success
assert_select '#is-public-project-notice .info', :text => l(:text_project_is_public_non_member)
end
end

def test_show_should_display_is_private_project_notice
@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 '#is-public-project-notice', :count => 0
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'})
Expand Down