Kaynağa Gözat

Group time entries by created date (#30233).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18003 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Go MAEDA 5 yıl önce
ebeveyn
işleme
ffa4e02817

+ 1
- 1
app/models/time_entry_query.rb Dosyayı Görüntüle

@@ -25,7 +25,7 @@ class TimeEntryQuery < Query
self.available_columns = [
QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
QueryColumn.new(:created_on, :sortable => "#{TimeEntry.table_name}.created_on", :default_order => 'desc'),
TimestampQueryColumn.new(:created_on, :sortable => "#{TimeEntry.table_name}.created_on", :default_order => 'desc', :groupable => true),
QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => :label_week),
QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement}),
QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),

+ 14
- 0
test/functional/timelog_controller_test.rb Dosyayı Görüntüle

@@ -1371,4 +1371,18 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_not_nil line
assert_include "#{issue.tracker} #1: #{issue.subject}", line
end

def test_index_grouped_by_created_on
skip unless TimeEntryQuery.new.groupable_columns.detect {|c| c.name == :created_on}

get :index, :params => {
:set_filter => 1,
:group_by => 'created_on'
}
assert_response :success

assert_select 'tr.group span.name', :text => '03/23/2007' do
assert_select '+ span.count', :text => '2'
end
end
end

Loading…
İptal
Kaydet