Commit 112e919823a3286fe7224b01ee3cd87b48c66304
1 parent
a5dbe353
Exists in
master
and in
4 other branches
Remove unnecessary namespaced resource
Showing
4 changed files
with
10 additions
and
31 deletions
Show diff stats
| ... | ... | @@ -0,0 +1,9 @@ |
| 1 | +class Admin::MembersController < Admin::ApplicationController | |
| 2 | + def destroy | |
| 3 | + user = User.find_by_username(params[:id]) | |
| 4 | + project = Project.find_with_namespace(params[:project_id]) | |
| 5 | + project.users_projects.where(user_id: user).first.destroy | |
| 6 | + | |
| 7 | + redirect_to :back | |
| 8 | + end | |
| 9 | +end | ... | ... |
app/controllers/admin/projects/application_controller.rb
| ... | ... | @@ -1,11 +0,0 @@ |
| 1 | -# Provides a base class for Admin controllers to subclass | |
| 2 | -# | |
| 3 | -# Automatically sets the layout and ensures an administrator is logged in | |
| 4 | -class Admin::Projects::ApplicationController < Admin::ApplicationController | |
| 5 | - | |
| 6 | - protected | |
| 7 | - | |
| 8 | - def project | |
| 9 | - @project ||= Project.find_with_namespace(params[:project_id]) | |
| 10 | - end | |
| 11 | -end |
app/controllers/admin/projects/members_controller.rb
| ... | ... | @@ -1,17 +0,0 @@ |
| 1 | -class Admin::Projects::MembersController < Admin::Projects::ApplicationController | |
| 2 | - def destroy | |
| 3 | - team_member_relation.destroy | |
| 4 | - | |
| 5 | - redirect_to :back | |
| 6 | - end | |
| 7 | - | |
| 8 | - private | |
| 9 | - | |
| 10 | - def team_member | |
| 11 | - @member ||= project.users.find_by_username(params[:id]) | |
| 12 | - end | |
| 13 | - | |
| 14 | - def team_member_relation | |
| 15 | - team_member.users_projects.find_by_project_id(project) | |
| 16 | - end | |
| 17 | -end |
config/routes.rb
| ... | ... | @@ -88,9 +88,7 @@ Gitlab::Application.routes.draw do |
| 88 | 88 | resource :background_jobs, controller: 'background_jobs', only: [:show] |
| 89 | 89 | |
| 90 | 90 | resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do |
| 91 | - scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do | |
| 92 | - resources :members, only: [:destroy] | |
| 93 | - end | |
| 91 | + resources :members, only: [:destroy] | |
| 94 | 92 | end |
| 95 | 93 | |
| 96 | 94 | root to: "dashboard#index" | ... | ... |