Refactor group routing
* separate controller actions from nested resources * prepare group routing for nested namespaces support Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
76ff9fffcc
commit
4ca3db3f9d
|
@ -12,16 +12,17 @@ constraints(GroupUrlConstrainer.new) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
|
resources :groups, only: [:index, :new, :create]
|
||||||
resources :groups, except: [:show] do
|
|
||||||
member do
|
scope(path: 'groups/:id', controller: :groups) do
|
||||||
get :issues
|
get :edit, as: :edit_group
|
||||||
get :merge_requests
|
get :issues, as: :issues_group
|
||||||
get :projects
|
get :merge_requests, as: :merge_requests_group
|
||||||
get :activity
|
get :projects, as: :projects_group
|
||||||
|
get :activity, as: :activity_group
|
||||||
end
|
end
|
||||||
|
|
||||||
scope module: :groups do
|
scope(path: 'groups/:group_id', module: :groups, as: :group) do
|
||||||
resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
|
resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
|
||||||
post :resend_invite, on: :member
|
post :resend_invite, on: :member
|
||||||
delete :leave, on: :collection
|
delete :leave, on: :collection
|
||||||
|
@ -29,9 +30,8 @@ scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
|
||||||
|
|
||||||
resource :avatar, only: [:destroy]
|
resource :avatar, only: [:destroy]
|
||||||
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
|
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
|
||||||
|
|
||||||
resources :labels, except: [:show], constraints: { id: /\d+/ }
|
resources :labels, except: [:show], constraints: { id: /\d+/ }
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
# Must be last route in this file
|
||||||
get 'groups/:id' => 'groups#show', as: :group_canonical
|
get 'groups/:id' => 'groups#show', as: :group_canonical
|
||||||
end
|
|
||||||
|
|
Loading…
Reference in New Issue