Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ADDED: Export User Permissions (Superuser & Admin) #14614

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

ADDED: Export User Permissions (Superuser & Admin) #14614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9770016
beginning of permission groups export
akemidx Nov 28, 2023
2a54797
permission level proof of formatting
akemidx Nov 28, 2023
f7d0cec
permissions query starto
akemidx Feb 13, 2024
8bbf6da
user block, trying to pick out ONLY permissions we wanna see
akemidx Feb 20, 2024
9397372
permissions, but they are now all in their own column because reasons???
akemidx Feb 20, 2024
5ffade6
unstash
akemidx Feb 26, 2024
e6b3660
lots of attempts and syntax, but no go
akemidx Mar 27, 2024
721902c
committed for later
akemidx Mar 28, 2024
e8d9701
array key existing
akemidx Apr 17, 2024
01c24ab
translating text
akemidx Apr 22, 2024
0d049a0
conflict resolution
akemidx Apr 23, 2024
0bc93c6
space
akemidx Apr 23, 2024
ac4aa97
develop reheading
akemidx Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/Http/Controllers/Users/UsersController.php
View file
Open in desktop
Expand Up @@ -559,6 +559,7 @@ public function getExportUserCsv()
trans('general.accessories'),
trans('general.consumables'),
trans('general.groups'),
trans('general.permission_level'),
trans('general.notes'),
trans('admin/users/table.activated'),
trans('general.created_at'),
Expand All @@ -573,6 +574,18 @@ public function getExportUserCsv()
$user_groups .= $user_group->name.', ';
}


$permissionstring = "";
if(array_key_exists("superuser", json_decode($user->permissions, true))) {
$permissionstring = trans('general.superuser');
}
elseif(array_key_exists("admin", json_decode($user->permissions, true))) {
$permissionstring = trans('general.admin');
}
else {
$permissionstring = trans('general.user');
}

// Add a new row with data
$values = [
$user->id,
Expand All @@ -590,6 +603,7 @@ public function getExportUserCsv()
$user->accessories->count(),
$user->consumables->count(),
$user_groups,
$permissionstring,
$user->notes,
($user->activated == '1') ? trans('general.yes') : trans('general.no'),
$user->created_at,
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/am-ET/general.php
View file
Open in desktop
Expand Up @@ -143,6 +143,7 @@
'generate_labels' => 'Generate Labels',
'github_markdown' => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
'groups' => 'Groups',
'permission_level' => 'Permission Level',
'gravatar_email' => 'Gravatar Email Address',
'gravatar_url' => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
'history' => 'History',
Expand Down Expand Up @@ -271,6 +272,7 @@
'status_labels' => 'Status Labels',
'status' => 'Status',
'accept_eula' => 'Acceptance Agreement',
'superuser' => 'Superuser',
'supplier' => 'Supplier',
'suppliers' => 'Suppliers',
'sure_to_delete' => 'Are you sure you wish to delete',
Expand Down