jro_apps/redmine Commit - r15262:03dbf8abb881

Remove special behaviour for listing issue time entries, use a filter for that....

Jean-Philippe Lang -

r15262:03dbf8abb881

parent child

Context file:

r15262:03dbf8abb881

Collapse all files

app/controllers/timelog_controller.rb +11 -8

               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :authorize, :only => [:show, :edit, :update, :bulk_edit, :bulk_update, :destroy]
-              before_filter :find_optional_project, :only => [:new, :create, :index, :report]
+              before_filter :find_optional_issue, :only => [:new, :create]
+              before_filter :find_optional_project, :only => [:index, :report]
               before_filter :authorize_global, :only => [:new, :create, :index, :report]
               accept_rss_auth :index
                 end
               end
-              def find_optional_project
+              def find_optional_issue
                 if params[:issue_id].present?
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
-                elsif params[:project_id].present?
+                else
+                  find_optional_project
+                end
+              end
+              def find_optional_project
+                if params[:project_id].present?
                   @project = Project.find(params[:project_id])
                 end
               rescue ActiveRecord::RecordNotFound
               # Returns the TimeEntry scope for index and report actions
               def time_entry_scope(options={})
-                scope = @query.results_scope(options)
+                @query.results_scope(options)
-                if @issue
-                  scope = scope.on_issue(@issue)
-                end
-                scope
               end
               def retrieve_time_entry_query

app/helpers/issues_helper.rb +4 -2

               def issue_spent_hours_details(issue)
                 if issue.total_spent_hours > 0
+                  path = project_time_entries_path(issue.project, :issue_id => "~#{issue.id}")
                   if issue.total_spent_hours == issue.spent_hours
-                    link_to(l_hours_short(issue.spent_hours), issue_time_entries_path(issue))
+                    link_to(l_hours_short(issue.spent_hours), path)
                   else
                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
-                    s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), issue_time_entries_path(issue)})"
+                    s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})"
                     s.html_safe
                   end
                 end

app/helpers/queries_helper.rb +3 -1

                 ungrouped = []
                 grouped = {}
                 query.available_filters.map do |field, field_options|
-                  if [:tree, :relation].include?(field_options[:type])
+                  if field_options[:type] == :relation
                     group = :label_relations
+                  elsif field_options[:type] == :tree
+                    group = query.is_a?(IssueQuery) ? :label_relations : nil
                   elsif field =~ /^(.+)\./
                     # association filters
                     group = "field_#{$1}"

app/helpers/routes_helper.rb +2 -6

               end
               def _time_entries_path(project, issue, *args)
-                if issue
+                if project
-                  issue_time_entries_path(issue, *args)
-                elsif project
                   project_time_entries_path(project, *args)
                 else
                   time_entries_path(*args)
               end
               def _report_time_entries_path(project, issue, *args)
-                if issue
+                if project
-                  report_issue_time_entries_path(issue, *args)
-                elsif project
                   report_project_time_entries_path(project, *args)
                 else
                   report_time_entries_path(*args)

app/helpers/timelog_helper.rb 0 -14

@@ -20,20 +20,6
20	module TimelogHelper	20	module TimelogHelper
21	include ApplicationHelper	21	include ApplicationHelper
22		22
23	def render_timelog_breadcrumb
24	links = []
25	links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
26	links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
27	if @issue
28	if @issue.visible?
29	links << link_to_issue(@issue, :subject => false)
30	else
31	links << "##{@issue.id}"
32	end
33	end
34	breadcrumb links
35	end
36
37	# Returns a collection of activities for a select field. time_entry	23	# Returns a collection of activities for a select field. time_entry
38	# is optional and will be used to check if the selected TimeEntryActivity	24	# is optional and will be used to check if the selected TimeEntryActivity
39	# is active.	25	# is active.

app/models/query.rb +1 -1

                   next unless expression =~ /^#{Regexp.escape(operator)}(.*)$/
                   values = $1
                   add_filter field, operator, values.present? ? values.split('|') : ['']
-                end || add_filter(field, '=', expression.split('|'))
+                end || add_filter(field, '=', expression.to_s.split('|'))
               end
               # Add multiple filters using +add_filter+

app/models/time_entry_query.rb +21 0

@@ -67,6 +67,9 class TimeEntryQuery < Query
67	) unless project_values.empty?	67	) unless project_values.empty?
68	end	68	end
69	end	69	end
		70
		71	add_available_filter("issue_id", :type => :tree, :label => :label_issue)
		72
70	principals.uniq!	73	principals.uniq!
71	principals.sort!	74	principals.sort!
72	users = principals.select {\|p\| p.is_a?(User)}	75	users = principals.select {\|p\| p.is_a?(User)}
@@ -114,6 +117,24 class TimeEntryQuery < Query
114	includes(:activity).	117	includes(:activity).
115	references(:activity)	118	references(:activity)
116	end	119	end
		120
		121	def sql_for_issue_id_field(field, operator, value)
		122	case operator
		123	when "="
		124	"#{TimeEntry.table_name}.issue_id = #{value.first.to_i}"
		125	when "~"
		126	issue = Issue.where(:id => value.first.to_i).first
		127	if issue && (issue_ids = issue.self_and_descendants.pluck(:id)).any?
		128	"#{TimeEntry.table_name}.issue_id IN (#{issue_ids.join(',')})"
		129	else
		130	"1=0"
		131	end
		132	when "!*"
		133	"#{TimeEntry.table_name}.issue_id IS NULL"
		134	when "*"
		135	"#{TimeEntry.table_name}.issue_id IS NOT NULL"
		136	end
		137	end
117		138
118	def sql_for_activity_id_field(field, operator, value)	139	def sql_for_activity_id_field(field, operator, value)
119	condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')	140	condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')

app/views/timelog/_date_range.html.erb +3 -3

             </div>
             <div class="tabs hide-when-print">
-            <% query_params = params.slice(:f, :op, :v, :sort, :query_id) %>
+            <% query_params = request.query_parameters %>
             <ul>
-                <li><%= link_to(l(:label_details), _time_entries_path(@project, @issue, query_params),
+                <li><%= link_to(l(:label_details), _time_entries_path(@project, nil, :params => query_params),
                                                    :class => (action_name == 'index' ? 'selected' : nil)) %></li>
-                <li><%= link_to(l(:label_report), _report_time_entries_path(@project, @issue, query_params),
+                <li><%= link_to(l(:label_report), _report_time_entries_path(@project, nil, :params => query_params),
                                                    :class => (action_name == 'report' ? 'selected' : nil)) %></li>
             </ul>
             </div>

app/views/timelog/index.html.erb +1 -3

                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
-            <%= render_timelog_breadcrumb %>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
-            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
+            <%= form_tag(_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
             <%= render :partial => 'date_range' %>
             <% end %>

app/views/timelog/report.html.erb +1 -3

                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
-            <%= render_timelog_breadcrumb %>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
-            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
+            <%= form_tag(_report_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>

config/routes.rb +1 -5

                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
-                resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
+                resources :time_entries, :controller => 'timelog', :only => [:new, :create]
-                  collection do
-                    get 'report'
-                  end
-                end
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end

test/functional/time_entry_reports_controller_test.rb 0 -9

@@ -128,15 +128,6 class TimeEntryReportsControllerTest < ActionController::TestCase
128	assert_equal "4.25", "%.2f" % assigns(:report).total_hours	128	assert_equal "4.25", "%.2f" % assigns(:report).total_hours
129	end	129	end
130		130
131	def test_report_at_issue_level
132	get :report, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
133	assert_response :success
134	assert_template 'report'
135	assert_not_nil assigns(:report)
136	assert_equal "154.25", "%.2f" % assigns(:report).total_hours
137	assert_select 'form#query_form[action=?]', '/issues/1/time_entries/report'
138	end
139
140	def test_report_by_week_should_use_commercial_year	131	def test_report_by_week_should_use_commercial_year
141	TimeEntry.delete_all	132	TimeEntry.delete_all
142	TimeEntry.generate!(:hours => '2', :spent_on => '2009-12-25') # 2009-52	133	TimeEntry.generate!(:hours => '2', :spent_on => '2009-12-25') # 2009-52

test/functional/timelog_controller_test.rb 0 -23

@@ -676,20 +676,6 class TimelogControllerTest < ActionController::TestCase
676	assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'	676	assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
677	end	677	end
678		678
679	def test_index_at_issue_level
680	get :index, :issue_id => 1
681	assert_response :success
682	assert_template 'index'
683	assert_not_nil assigns(:entries)
684	assert_equal 2, assigns(:entries).size
685	assert_not_nil assigns(:total_hours)
686	assert_equal 154.25, assigns(:total_hours)
687	# display all time
688	assert_nil assigns(:from)
689	assert_nil assigns(:to)
690	assert_select 'form#query_form[action=?]', '/issues/1/time_entries'
691	end
692
693	def test_index_should_sort_by_spent_on_and_created_on	679	def test_index_should_sort_by_spent_on_and_created_on
694	t1 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:00:00', :activity_id => 10)	680	t1 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:00:00', :activity_id => 10)
695	t2 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:05:00', :activity_id => 10)	681	t2 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:05:00', :activity_id => 10)
@@ -809,15 +795,6 class TimelogControllerTest < ActionController::TestCase
809	end	795	end
810	end	796	end
811		797
812	def test_index_at_issue_level_should_include_csv_export_dialog
813	get :index, :issue_id => 3
814	assert_response :success
815
816	assert_select '#csv-export-options' do
817	assert_select 'form[action=?][method=get]', '/issues/3/time_entries.csv'
818	end
819	end
820
821	def test_index_csv_all_projects	798	def test_index_csv_all_projects
822	with_settings :date_format => '%m/%d/%Y' do	799	with_settings :date_format => '%m/%d/%Y' do
823	get :index, :format => 'csv'	800	get :index, :format => 'csv'

test/integration/routing/timelog_test.rb +1 -7

               end
               def test_timelogs_scoped_under_issues
-                should_route 'GET /issues/234/time_entries' => 'timelog#index', :issue_id => '234'
+                should_route 'GET  /issues/234/time_entries/new' => 'timelog#new', :issue_id => '234'
-                should_route 'GET /issues/234/time_entries.csv' => 'timelog#index', :issue_id => '234', :format => 'csv'
-                should_route 'GET /issues/234/time_entries.atom' => 'timelog#index', :issue_id => '234', :format => 'atom'
-                should_route 'GET /issues/234/time_entries/new' => 'timelog#new', :issue_id => '234'
                 should_route 'POST /issues/234/time_entries' => 'timelog#create', :issue_id => '234'
               end
                 should_route 'GET /projects/foo/time_entries/report' => 'timelog#report', :project_id => 'foo'
                 should_route 'GET /projects/foo/time_entries/report.csv' => 'timelog#report', :project_id => 'foo', :format => 'csv'
-                should_route 'GET /issues/234/time_entries/report' => 'timelog#report', :issue_id => '234'
-                should_route 'GET /issues/234/time_entries/report.csv' => 'timelog#report', :issue_id => '234', :format => 'csv'
               end
               def test_timelogs_bulk_edit

test/unit/helpers/routes_helper_test.rb 0 -4

               def test_time_entries_path
                 assert_equal '/projects/ecookbook/time_entries', _time_entries_path(Project.find(1), nil)
-                assert_equal '/issues/1/time_entries', _time_entries_path(Project.find(1), Issue.find(1))
-                assert_equal '/issues/1/time_entries', _time_entries_path(nil, Issue.find(1))
                 assert_equal '/time_entries', _time_entries_path(nil, nil)
               end
               def test_report_time_entries_path
                 assert_equal '/projects/ecookbook/time_entries/report', _report_time_entries_path(Project.find(1), nil)
-                assert_equal '/issues/1/time_entries/report', _report_time_entries_path(Project.find(1), Issue.find(1))
-                assert_equal '/issues/1/time_entries/report', _report_time_entries_path(nil, Issue.find(1))
                 assert_equal '/time_entries/report', _report_time_entries_path(nil, nil)
               end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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