Browse Source

Fix totals not displayed in projects list view (#32896).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19469 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA 4 years ago
parent
commit
5b74828013

+ 1
- 0
app/views/projects/_list.html.erb View File

@@ -1,3 +1,4 @@
<%= render_query_totals(@query) %>
<div class="autoscroll">
<table class="list projects odd-even <%= @query.css_classes %>">
<thead>

+ 2
- 1
public/stylesheets/application.css View File

@@ -405,7 +405,8 @@ div.table-list.boards .table-list-cell.name {width: 30%;}
.query-totals {text-align:right;}
.query-totals>span:not(:first-child) {margin-left:0.6em;}
.query-totals .value {font-weight:bold;}
body.controller-issues .query-totals {margin-top:-2.3em;}
.query-totals {margin-top:-2.3em;}
body.controller-timelog .query-totals {margin-top:initial;}

td.center {text-align:center;}


+ 18
- 0
test/functional/projects_controller_test.rb View File

@@ -230,6 +230,24 @@ class ProjectsControllerTest < Redmine::ControllerTest
)
end

def test_index_with_int_custom_field_total
@request.session[:user_id] = 1

field = ProjectCustomField.generate!(:field_format => 'int')
CustomValue.create!(:customized => Project.find(1), :custom_field => field, :value => '2')
CustomValue.create!(:customized => Project.find(2), :custom_field => field, :value => '7')
get(
:index,
:params => {
:display_type => 'list',
:t => ["cf_#{field.id}"]
}
)
assert_response :success
assert_select '.query-totals'
assert_select ".total-for-cf-#{field.id} span.value", :text => '9'
end

def test_autocomplete_js
get(
:autocomplete,

Loading…
Cancel
Save