diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-01-28 01:17:57 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-01-28 01:17:57 +0000 |
| commit | b4ada2b5ef471c8b60a37d098c8140e04286a890 (patch) | |
| tree | 0a08742ae4e57f6dcdc2c7bff1d81892a32bd9d7 | |
| parent | 2845d18158d12629348cf5c53c48534d3e91632e (diff) | |
| download | redmine-b4ada2b5ef471c8b60a37d098c8140e04286a890.tar.gz redmine-b4ada2b5ef471c8b60a37d098c8140e04286a890.zip | |
Merged r19469 from trunk to 4.1-stable (#32896).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19470 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/projects/_list.html.erb | 1 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 3 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 18 |
3 files changed, 21 insertions, 1 deletions
diff --git a/app/views/projects/_list.html.erb b/app/views/projects/_list.html.erb index 8d8c0d9c1..3c90921ec 100644 --- a/app/views/projects/_list.html.erb +++ b/app/views/projects/_list.html.erb @@ -1,3 +1,4 @@ +<%= render_query_totals(@query) %> <div class="autoscroll"> <table class="list projects odd-even <%= @query.css_classes %>"> <thead> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index cac1d3fd4..dcada0e46 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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;} diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index b09af65bb..975e3bb6a 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -232,6 +232,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, :params => { :format => 'js', |