Admin can see, edit and remove user identities
Related to #1415 (closed) and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224
Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com
Merge request reports
Activity
@DouweM can you review code?
Added 9 commits:
Toggle commit listReassigned to @DouweM
1 %tr 2 %td 3 = identity.provider 4 %td 5 = identity.extern_uid 6 %td 7 = link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-xs btn-grouped' do 8 %i.fa.fa-edit 9 Edit 10 = link_to [:admin, @user, identity], method: :delete, 11 class: 'btn btn-xs btn-danger', 12 data: { confirm: "Are you sure you want to remove this identity" } do 13 %i.fa.fa-trash 14 Delete I think it's better to have them regular size
@DouweM its no consitency now. Projects list ->
btn-sm
. Users list ->btn-xs
. And regular size buttons are too big for lists and tables. So we should change it everywhere tosm
orxs
@dzaporozhets Ah yes I see.
@DouweM I created an issue for admin UI - https://dev.gitlab.org/gitlab/gitlabhq/issues/2426
12 def update 13 if @identity.update_attributes(identity_params) 14 redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.' 15 else 16 render :edit 17 end 18 end 19 20 def destroy 21 respond_to do |format| 22 if @identity.destroy 23 format.html { redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.' } 24 else 25 format.html { redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' } 26 end 27 end - app/views/admin/identities/index.html.haml 0 → 100644
1 %h3.page-title 2 Identities for 3 = link_to @user.name, [:admin, @user] 4 5 %hr 6 if @identities.present? 7 %table.table
Please register or sign in to reply