jro_apps/redmine Commit - r13060:2e9b28906db6

Removes routes for time entries nested under project/issues....

Jean-Philippe Lang -

r13060:2e9b28906db6

parent child

Context file:

r13060:2e9b28906db6

Collapse all files

test/unit/helpers/routes_helper_test.rb created 644 +45 0

@@ -0,0 +1,45
	1	# encoding: utf-8
	2	#
	3	# Redmine - project management software
	4	# Copyright (C) 2006-2014 Jean-Philippe Lang
	5	#
	6	# This program is free software; you can redistribute it and/or
	7	# modify it under the terms of the GNU General Public License
	8	# as published by the Free Software Foundation; either version 2
	9	# of the License, or (at your option) any later version.
	10	#
	11	# This program is distributed in the hope that it will be useful,
	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with this program; if not, write to the Free Software
	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	19
	20	require File.expand_path('../../../test_helper', __FILE__)
	21
	22	class RoutesHelperTest < ActionView::TestCase
	23	include Rails.application.routes.url_helpers
	24
	25	def test_time_entries_path
	26	assert_equal '/projects/ecookbook/time_entries', _time_entries_path(Project.find(1), nil)
	27	assert_equal '/issues/1/time_entries', _time_entries_path(Project.find(1), Issue.find(1))
	28	assert_equal '/issues/1/time_entries', _time_entries_path(nil, Issue.find(1))
	29	assert_equal '/time_entries', _time_entries_path(nil, nil)
	30	end
	31
	32	def test_report_time_entries_path
	33	assert_equal '/projects/ecookbook/time_entries/report', _report_time_entries_path(Project.find(1), nil)
	34	assert_equal '/issues/1/time_entries/report', _report_time_entries_path(Project.find(1), Issue.find(1))
	35	assert_equal '/issues/1/time_entries/report', _report_time_entries_path(nil, Issue.find(1))
	36	assert_equal '/time_entries/report', _report_time_entries_path(nil, nil)
	37	end
	38
	39	def test_new_time_entry_path
	40	assert_equal '/projects/ecookbook/time_entries/new', _new_time_entry_path(Project.find(1), nil)
	41	assert_equal '/issues/1/time_entries/new', _new_time_entry_path(Project.find(1), Issue.find(1))
	42	assert_equal '/issues/1/time_entries/new', _new_time_entry_path(nil, Issue.find(1))
	43	assert_equal '/time_entries/new', _new_time_entry_path(nil, nil)
	44	end
	45	end

app/helpers/routes_helper.rb +30 0

@@ -36,4 +36,34 module RoutesHelper
36	def _project_gantt_path(project, *args)	36	def _project_gantt_path(project, *args)
37	project ? project_gantt_path(project, args) : issues_gantt_path(args)	37	project ? project_gantt_path(project, args) : issues_gantt_path(args)
38	end	38	end
		39
		40	def _time_entries_path(project, issue, *args)
		41	if issue
		42	issue_time_entries_path(issue, *args)
		43	elsif project
		44	project_time_entries_path(project, *args)
		45	else
		46	time_entries_path(*args)
		47	end
		48	end
		49
		50	def _report_time_entries_path(project, issue, *args)
		51	if issue
		52	report_issue_time_entries_path(issue, *args)
		53	elsif project
		54	report_project_time_entries_path(project, *args)
		55	else
		56	report_time_entries_path(*args)
		57	end
		58	end
		59
		60	def _new_time_entry_path(project, issue, *args)
		61	if issue
		62	new_issue_time_entry_path(issue, *args)
		63	elsif project
		64	new_project_time_entry_path(project, *args)
		65	else
		66	new_time_entry_path(*args)
		67	end
		68	end
39	end	69	end

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

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

app/views/timelog/index.html.erb +2 -2

             <div class="contextual">
             <%= link_to l(:button_log_time),
-                        {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue},
+                        _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <h2><%= l(:label_spent_time) %></h2>
-            <%= form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
             <%= render :partial => 'date_range' %>
             <% end %>

app/views/timelog/report.html.erb +4 -4

             <div class="contextual">
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
+            <%= link_to l(:button_log_time),
+                        _new_time_entry_path(@project, @issue),
+                        :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
-            <%= form_tag({:controller => 'timelog', :action => 'report',
+            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
-                          :project_id => @project, :issue_id => @issue},
-                        :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>

config/routes.rb +1 -7

                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
-                resources :issues, :only => [:index, :new, :create] do
+                resources :issues, :only => [:index, :new, :create]
-                  resources :time_entries, :controller => 'timelog' do
-                    collection do
-                      get 'report'
-                    end
-                  end
-                end
                 # issue form update
                 match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'

test/functional/time_entry_reports_controller_test.rb +2 -2

               end
               def test_report_at_issue_level
-                get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
+                get :report, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "154.25", "%.2f" % assigns(:report).total_hours
                 assert_tag :form,
-                  :attributes => {:action => "/projects/ecookbook/issues/1/time_entries/report", :id => 'query_form'}
+                  :attributes => {:action => "/issues/1/time_entries/report", :id => 'query_form'}
               end
               def test_report_by_week_should_use_commercial_year

test/functional/timelog_controller_test.rb +3 -3

                 assert_nil assigns(:from)
                 assert_nil assigns(:to)
                 assert_tag :form,
-                  :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
+                  :attributes => {:action => "/issues/1/time_entries", :id => 'query_form'}
               end
               def test_index_should_sort_by_spent_on_and_created_on
               end
               def test_index_at_issue_level_should_include_csv_export_dialog
-                get :index, :project_id => 'ecookbook', :issue_id => 3
+                get :index, :issue_id => 3
                 assert_response :success
                 assert_select '#csv-export-options' do
-                  assert_select 'form[action=?][method=get]', '/projects/ecookbook/issues/3/time_entries.csv'
+                  assert_select 'form[action=?][method=get]', '/issues/3/time_entries.csv'
                 end
               end

test/integration/routing/timelog_test.rb 0 -51

@@ -134,57 +134,6 class RoutingTimelogsTest < ActionController::IntegrationTest
134	)	134	)
135	end	135	end
136		136
137	def test_timelogs_scoped_under_project_and_issues
138	assert_routing(
139	{ :method => 'get',
140	:path => "/projects/ecookbook/issues/234/time_entries" },
141	{ :controller => 'timelog', :action => 'index',
142	:issue_id => '234', :project_id => 'ecookbook' }
143	)
144	assert_routing(
145	{ :method => 'get',
146	:path => "/projects/ecookbook/issues/234/time_entries.csv" },
147	{ :controller => 'timelog', :action => 'index',
148	:issue_id => '234', :project_id => 'ecookbook', :format => 'csv' }
149	)
150	assert_routing(
151	{ :method => 'get',
152	:path => "/projects/ecookbook/issues/234/time_entries.atom" },
153	{ :controller => 'timelog', :action => 'index',
154	:issue_id => '234', :project_id => 'ecookbook', :format => 'atom' }
155	)
156	assert_routing(
157	{ :method => 'get',
158	:path => "/projects/ecookbook/issues/234/time_entries/new" },
159	{ :controller => 'timelog', :action => 'new',
160	:issue_id => '234', :project_id => 'ecookbook' }
161	)
162	assert_routing(
163	{ :method => 'get',
164	:path => "/projects/ecookbook/issues/234/time_entries/22/edit" },
165	{ :controller => 'timelog', :action => 'edit', :id => '22',
166	:issue_id => '234', :project_id => 'ecookbook' }
167	)
168	assert_routing(
169	{ :method => 'post',
170	:path => "/projects/ecookbook/issues/234/time_entries" },
171	{ :controller => 'timelog', :action => 'create',
172	:issue_id => '234', :project_id => 'ecookbook' }
173	)
174	assert_routing(
175	{ :method => 'put',
176	:path => "/projects/ecookbook/issues/234/time_entries/22" },
177	{ :controller => 'timelog', :action => 'update', :id => '22',
178	:issue_id => '234', :project_id => 'ecookbook' }
179	)
180	assert_routing(
181	{ :method => 'delete',
182	:path => "/projects/ecookbook/issues/234/time_entries/55" },
183	{ :controller => 'timelog', :action => 'destroy', :id => '55',
184	:issue_id => '234', :project_id => 'ecookbook' }
185	)
186	end
187
188	def test_timelogs_report	137	def test_timelogs_report
189	assert_routing(	138	assert_routing(
190	{ :method => 'get',	139	{ :method => 'get',

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