jro_apps/redmine Commit - r13227:043c2c92da7d

Removed deep nested time entries routes....

Jean-Philippe Lang -

r13227:043c2c92da7d

parent child

Context file:

r13227:043c2c92da7d

Collapse all files

app/views/timelog/edit.html.erb +1 -1

             <h2><%= l(:label_spent_time) %></h2>
-            <%= labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %>
+            <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry) do |f| %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

config/routes.rb +2 -2

                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
-                resources :time_entries, :controller => 'timelog' do
+                resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
-                resources :time_entries, :controller => 'timelog' do
+                resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
                   collection do
                     get 'report'
                   end

test/functional/timelog_controller_test.rb +1 -2

                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
-                # Default activity selected
+                assert_tag :tag => 'form', :attributes => { :action => '/time_entries/2' }
-                assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity

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

                 should_route 'GET /projects/foo/time_entries.atom' => 'timelog#index', :project_id => 'foo', :format => 'atom'
                 should_route 'GET /projects/foo/time_entries/new' => 'timelog#new', :project_id => 'foo'
                 should_route 'POST /projects/foo/time_entries' => 'timelog#create', :project_id => 'foo'
-                # TODO: unused?
-                should_route 'GET /projects/foo/time_entries/22/edit' => 'timelog#edit', :project_id => 'foo', :id => '22'
-                should_route 'PUT /projects/foo/time_entries/22' => 'timelog#update', :project_id => 'foo', :id => '22'
-                should_route 'DELETE /projects/foo/time_entries/22' => 'timelog#destroy', :project_id => 'foo', :id => '22'
               end
               def test_timelogs_scoped_under_issues
                 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'
-                # TODO: unused?
-                should_route 'GET /issues/234/time_entries/22/edit' => 'timelog#edit', :issue_id => '234', :id => '22'
-                should_route 'PUT /issues/234/time_entries/22' => 'timelog#update', :issue_id => '234', :id => '22'
-                should_route 'DELETE /issues/234/time_entries/22' => 'timelog#destroy', :issue_id => '234', :id => '22'
               end
               def test_timelogs_report

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