jro_apps/redmine Commit - r14176:d5bb0e85931b

Merged r14554 (#20688)....

Jean-Philippe Lang -

r14176:d5bb0e85931b

parent child

Context file:

r14176:d5bb0e85931b

app/models/issue_query.rb +4 0

                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
+                QueryColumn.new(:total_estimated_hours,
+                  :sortable => "COALESCE((SELECT SUM(estimated_hours) FROM #{Issue.table_name} subtasks" +
+                    " WHERE subtasks.root_id = #{Issue.table_name}.root_id AND subtasks.lft >= #{Issue.table_name}.lft AND subtasks.rgt <= #{Issue.table_name}.rgt), 0)",
+                  :default_order => 'desc'),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
                 QueryColumn.new(:closed_on, :sortable => "#{Issue.table_name}.closed_on", :default_order => 'desc'),

config/locales/en.yml +1 0

               field_default_status: Default status
               field_users_visibility: Users visibility
               field_time_entries_visibility: Time logs visibility
+              field_total_estimated_hours: Total estimated time
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

               field_default_status: Statut par défaut
               field_users_visibility: Visibilité des utilisateurs
               field_time_entries_visibility: Visibilité du temps passé
+              field_total_estimated_hours: Temps estimé total
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

test/functional/issues_controller_test.rb +12 0

                 hours = assigns(:issues).collect(&:total_spent_hours)
                 assert_equal hours.sort.reverse, hours
               end
+              def test_index_sort_by_total_estimated_hours
+                get :index, :sort => 'total_estimated_hours:desc'
+                assert_response :success
+                hours = assigns(:issues).collect(&:total_estimated_hours)
+                assert_equal hours.sort.reverse, hours
+              end
               def test_index_sort_by_user_custom_field
                 cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1,2,3], :field_format => 'user')
                 assert_select 'table.issues tr#issue-3 td.total_spent_hours', :text => '1.00'
               end
+              def test_index_with_total_estimated_hours_column
+                get :index, :set_filter => 1, :c => %w(subject total_estimated_hours)
+                assert_select 'table.issues td.total_estimated_hours'
+              end
               def test_index_should_not_show_spent_hours_column_without_permission
                 Role.anonymous.remove_permission! :view_time_entries
                 get :index, :set_filter => 1, :c => %w(subject spent_hours)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages