diff --git a/app/views/projects/_list.html.erb b/app/views/projects/_list.html.erb index 03c5ce059..f5eae37a6 100644 --- a/app/views/projects/_list.html.erb +++ b/app/views/projects/_list.html.erb @@ -41,14 +41,22 @@ <% end %> "> - <% if @admin_list && !entry.scheduled_for_deletion? %> - <%= check_box_tag("ids[]", entry.id, false, :id => nil) %> + <% if @admin_list %> + <% if !entry.scheduled_for_deletion? %> + <%= check_box_tag("ids[]", entry.id, false, :id => nil) %> + <% else %> + + <% end %> <% end %> <% @query.inline_columns.each do |column| %> <%= content_tag('td', column_content(column, entry), :class => column.css_classes) %> <% end %> - <% if @admin_list && !entry.scheduled_for_deletion? %> - <%= link_to_context_menu %> + <% if @admin_list %> + <% if !entry.scheduled_for_deletion? %> + <%= link_to_context_menu %> + <% else %> + + <% end %> <% end %> <% end -%> diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb index 041253230..3da9da707 100644 --- a/test/integration/projects_test.rb +++ b/test/integration/projects_test.rb @@ -52,4 +52,22 @@ class ProjectsTest < Redmine::IntegrationTest assert_response :not_found end end + + def test_list_layout_when_show_projects_scheduled_for_deletion + project = Project.find(1) + project.update_attribute :status, Project::STATUS_SCHEDULED_FOR_DELETION + + log_user('admin', 'admin') + + get '/admin/projects', :params => { :f => ['status'], :v => { 'status' => ['10'] } } + assert_response :success + + assert_select '#project-1' do + assert_select 'td.checkbox.hide-when-print' + assert_select 'td.name' + assert_select 'td.identifier' + assert_select 'td.short_description' + assert_select 'td.buttons', text: '' + end + end end