Project

General

Profile

« Previous | Next » 

Revision 4265

Added by Eric Davis over 14 years ago

Refactor: change :id on WikiController to use :project_id

Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.

View differences:

routes.rb
29 29 
  map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
30 30 
  map.with_options :controller => 'wiki' do |wiki_routes|
31 31 
    wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
32 
      wiki_views.connect 'projects/:id/wiki/export', :action => 'export'
33 
      wiki_views.connect 'projects/:id/wiki/page_index', :action => 'page_index'
34 
      wiki_views.connect 'projects/:id/wiki/date_index', :action => 'date_index'
35 
      wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
36 
      wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
37 
      wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
38 
      wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
39 
      wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
40 
      wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
32 
      wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
33 
      wiki_views.connect 'projects/:project_id/wiki/page_index', :action => 'page_index'
34 
      wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
35 
      wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'index', :page => nil
36 
      wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit'
37 
      wiki_views.connect 'projects/:project_id/wiki/:page/rename', :action => 'rename'
38 
      wiki_views.connect 'projects/:project_id/wiki/:page/history', :action => 'history'
39 
      wiki_views.connect 'projects/:project_id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
40 
      wiki_views.connect 'projects/:project_id/wiki/:page/annotate/:version', :action => 'annotate'
41 41 
    end
42 42
43 
    wiki_routes.connect 'projects/:id/wiki/:page/:action',
43 
    wiki_routes.connect 'projects/:project_id/wiki/:page/:action',
44 44 
      :action => /edit|rename|destroy|preview|protect/,
45 45 
      :conditions => {:method => :post}
46 46 
  end

Also available in: Unified diff