Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-09 15:09:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-09 15:09:42 +0300
commit1361891b0a87187364d1586395df176a8984e914 (patch)
tree4f47ddf2cd0d06cd0eb98a7bf1b7001504e6416b /app/helpers/users_helper.rb
parent109562e64e1e1c51fe32a7443df86ee63b856115 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
-rw-r--r--app/helpers/users_helper.rb23
1 files changed, 23 insertions, 0 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 6679b6224ed..a58f8a6f792 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,6 +1,13 @@
# frozen_string_literal: true
module UsersHelper
+ def admin_users_data_attributes(users)
+ {
+ users: Admin::UserSerializer.new.represent(users).to_json,
+ paths: admin_users_paths.to_json
+ }
+ end
+
def user_link(user)
link_to(user.name, user_path(user),
title: user.email,
@@ -208,6 +215,22 @@ module UsersHelper
private
+ def admin_users_paths
+ {
+ edit: edit_admin_user_path(:id),
+ approve: approve_admin_user_path(:id),
+ reject: reject_admin_user_path(:id),
+ unblock: unblock_admin_user_path(:id),
+ block: block_admin_user_path(:id),
+ deactivate: deactivate_admin_user_path(:id),
+ activate: activate_admin_user_path(:id),
+ unlock: unlock_admin_user_path(:id),
+ delete: admin_user_path(:id),
+ delete_with_contributions: admin_user_path(:id),
+ admin_user: admin_user_path(:id)
+ }
+ end
+
def blocked_user_badge(user)
pending_approval_badge = { text: s_('AdminUsers|Pending approval'), variant: 'info' }
return pending_approval_badge if user.blocked_pending_approval?