diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-03 11:55:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-03 11:55:24 +0000 |
| commit | b0ade644d60c471e935f6b5f269d41824e0df8b8 (patch) | |
| tree | c89a8a5199b70ee3f1bfe48d148010a23d5a90c3 /config | |
| parent | 90ed0784458a16f57a73e2eb80bdcaa2398b092b (diff) | |
| download | redmine-b0ade644d60c471e935f6b5f269d41824e0df8b8.tar.gz redmine-b0ade644d60c471e935f6b5f269d41824e0df8b8.zip | |
Changed timelogs filters to use non-AJAX requests (#1965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index db458be75..7daac2a1a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,14 +14,15 @@ ActionController::Routing::Routes.draw do |map| map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow' map.connect 'help/:ctrl/:page', :controller => 'help' - map.connect 'projects/:project_id/time_entries/report', :controller => 'time_entry_reports', :action => 'report' map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report| + time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report' + time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report.:format' + time_report.connect 'projects/:project_id/time_entries/report' + time_report.connect 'projects/:project_id/time_entries/report.:format' time_report.connect 'time_entries/report' time_report.connect 'time_entries/report.:format' - time_report.connect 'projects/:project_id/time_entries/report.:format' end - # TODO: wasteful since this is also nested under issues, projects, and projects/issues map.resources :time_entries, :controller => 'timelog' map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} |