Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-22 15:33:22 +01:00
Code Issues Packages Projects Releases Activity

Merged r23026 from trunk to 5.1-stable (#41217).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23031 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-09-07 04:10:21 +00:00
parent 9bdce9a821
commit 6b736fe533
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/projects/_list.html.erb
View File

@@ -41,14 +41,22 @@
</tr>
<% end %>
<tr id="project-<%= entry.id %>" class="<%= cycle('odd', 'even') %> hascontextmenu <%= entry.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<% if @admin_list && !entry.scheduled_for_deletion? %>
<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
<% if @admin_list %>
<% if !entry.scheduled_for_deletion? %>
<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
<% else %>
<td class="checkbox hide-when-print"></td>
<% 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? %>
<td class="buttons"><%= link_to_context_menu %></td>
<% if @admin_list %>
<% if !entry.scheduled_for_deletion? %>
<td class="buttons"><%= link_to_context_menu %></td>
<% else %>
<td class="buttons"></td>
<% end %>
<% end %>
</tr>
<% end -%>

18
test/integration/projects_test.rb
View File

@@ -52,4 +52,22 @@ class ProjectsTest < Redmine::IntegrationTest
assert_response 404
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