diff options
| author | Drew Blessing <drew@gitlab.com> | 2015-12-11 14:33:15 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2015-12-15 13:54:35 -0600 |
| commit | 577448ab6ab35abbf0263bf8677dfde6d9770c3f (patch) | |
| tree | 6355effd4303933bd374463d467dbc18181e92ca | |
| parent | 2b4a3bc524c0db3f6e4e3d2b2f34ec29e358b240 (diff) | |
| download | gitlab-ce-577448ab6ab35abbf0263bf8677dfde6d9770c3f.tar.gz | |
Allow admin to create new user identities
| -rw-r--r-- | app/controllers/admin/identities_controller.rb | 17 | ||||
| -rw-r--r-- | app/views/admin/identities/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/admin/identities/new.html.haml | 4 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index d28614731f9..e383fe38ea6 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -1,6 +1,21 @@ class Admin::IdentitiesController < Admin::ApplicationController before_action :user - before_action :identity, except: :index + before_action :identity, except: [:index, :new, :create] + + def new + @identity = Identity.new + end + + def create + @identity = Identity.new(identity_params) + @identity.user_id = user.id + + if @identity.save + redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully created.' + else + render :new + end + end def index @identities = @user.identities diff --git a/app/views/admin/identities/index.html.haml b/app/views/admin/identities/index.html.haml index 8358a14445b..741d111fb7d 100644 --- a/app/views/admin/identities/index.html.haml +++ b/app/views/admin/identities/index.html.haml @@ -1,6 +1,7 @@ - page_title "Identities", @user.name, "Users" = render 'admin/users/head' += link_to 'New Identity', new_admin_user_identity_path, class: 'pull-right btn btn-new' - if @identities.present? .table-holder %table.table diff --git a/app/views/admin/identities/new.html.haml b/app/views/admin/identities/new.html.haml new file mode 100644 index 00000000000..e30bf0ef0ee --- /dev/null +++ b/app/views/admin/identities/new.html.haml @@ -0,0 +1,4 @@ +- page_title "New Identity" +%h3.page-title New identity +%hr += render 'form' diff --git a/config/routes.rb b/config/routes.rb index e2d4fcb65a8..9900329a315 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -188,7 +188,7 @@ Rails.application.routes.draw do namespace :admin do resources :users, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do resources :keys, only: [:show, :destroy] - resources :identities, only: [:index, :edit, :update, :destroy] + resources :identities, except: [:show] delete 'stop_impersonation' => 'impersonation#destroy', on: :collection |