Преглед на файлове

route: repository: move :repository_id routes before non :repository_id routes

On Rails3 new route format, tests pass except following routes.

* 'projects/:id/repository' :action => 'show'
* 'projects/:id/repository/:repository_id' :action => 'show'

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8718 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/1.4.0
Toshi MARUYAMA преди 12 години
родител
ревизия
f49d8d8c5f
променени са 1 файла, в които са добавени 26 реда и са изтрити 23 реда
  1. 26
    23
      config/routes.rb

+ 26
- 23
config/routes.rb Целия файл

@@ -233,58 +233,61 @@ ActionController::Routing::Routes.draw do |map|
repositories.with_options :conditions => {:method => :get} do |repository_views|
repository_views.connect 'projects/:id/repository',
:action => 'show'

repository_views.connect 'projects/:id/repository/:repository_id/statistics',
:action => 'stats'
repository_views.connect 'projects/:id/repository/:repository_id/graph',
:action => 'graph'

repository_views.connect 'projects/:id/repository/statistics',
:action => 'stats'
repository_views.connect 'projects/:id/repository/graph',
:action => 'graph'
repository_views.connect 'projects/:id/repository/revisions',

repository_views.connect 'projects/:id/repository/:repository_id/revisions',
:action => 'revisions'
repository_views.connect 'projects/:id/repository/revisions.:format',
repository_views.connect 'projects/:id/repository/:repository_id/revisions.:format',
:action => 'revisions'
repository_views.connect 'projects/:id/repository/revisions/:rev',
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev',
:action => 'revision'
repository_views.connect 'projects/:id/repository/revisions/:rev/diff',
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff',
:action => 'diff'
repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format',
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff.:format',
:action => 'diff'
repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path',
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/raw/*path',
:action => 'entry', :format => 'raw'
repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path',
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/:action/*path',
:requirements => {
:action => /(browse|show|entry|changes|annotate|diff)/,
:rev => /[a-z0-9\.\-_]+/
}
repository_views.connect 'projects/:id/repository/raw/*path',
repository_views.connect 'projects/:id/repository/:repository_id/raw/*path',
:action => 'entry', :format => 'raw'
repository_views.connect 'projects/:id/repository/:action/*path',
repository_views.connect 'projects/:id/repository/:repository_id/:action/*path',
:requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }

# Same routes with a repository_id
repository_views.connect 'projects/:id/repository/:repository_id/statistics',
:action => 'stats'
repository_views.connect 'projects/:id/repository/:repository_id/graph',
:action => 'graph'
repository_views.connect 'projects/:id/repository/:repository_id/revisions',
repository_views.connect 'projects/:id/repository/revisions',
:action => 'revisions'
repository_views.connect 'projects/:id/repository/:repository_id/revisions.:format',
repository_views.connect 'projects/:id/repository/revisions.:format',
:action => 'revisions'
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev',
repository_views.connect 'projects/:id/repository/revisions/:rev',
:action => 'revision'
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff',
repository_views.connect 'projects/:id/repository/revisions/:rev/diff',
:action => 'diff'
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff.:format',
repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format',
:action => 'diff'
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/raw/*path',
repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path',
:action => 'entry', :format => 'raw'
repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/:action/*path',
repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path',
:requirements => {
:action => /(browse|show|entry|changes|annotate|diff)/,
:rev => /[a-z0-9\.\-_]+/
}
repository_views.connect 'projects/:id/repository/:repository_id/raw/*path',
repository_views.connect 'projects/:id/repository/raw/*path',
:action => 'entry', :format => 'raw'
repository_views.connect 'projects/:id/repository/:repository_id/:action/*path',
repository_views.connect 'projects/:id/repository/:action/*path',
:requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }

repository_views.connect 'projects/:id/repository/:repository_id',
:action => 'show'
end

Loading…
Отказ
Запис