mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-29 14:41:35 -08:00
9c8ca6af21
commite321aeabae
Merge:8ec99ff43
37568ae9e
Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit37568ae9ec
Merge:01a832169
32ad9050c
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit32ad9050cf
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169c
Merge:bcad49ce7
3c6883489
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit3c6883489c
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1b
Merge:714576be4
29f3a5c48
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit29f3a5c48f
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45
Merge:b999c50a2
512899294
Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit5128992940
Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2e
Merge:9ca20e496
e3906b245
Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commite3906b245c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964
Merge:e0644dbbf
456a74d88
Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit456a74d88c
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commitb725bd0fae
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6
Merge:5b6925b00
004ecad05
Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit5b6925b00c
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bf
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit24c43056ba
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit606b7e905d
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commitd73ddad477
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721e
Merge:7410b1683
8994f3e15
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit7410b16835
Merge:e955c983a
b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit8994f3e15e
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77ca
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3
Merge:2fa17ac18
eed41e454
Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commitb09e7d19b3
Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit2fa17ac185
Merge:b90515437
3b1e46f72
Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit3b1e46f72b
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754f
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792a
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfb
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373
Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46a
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229
Merge:81a633288
897757bd0
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit897757bd04
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889
Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit6e563f6e4b
Merge:5320f5c67
7f69ae953
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67c
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953b
Merge:c79f8c1ba
17f6fbabf
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit17f6fbabfa
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commitc79f8c1baf
Merge:12c92e30b
536401fe0
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit12c92e30b7
Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commitfd10b755b0
Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commitdbbb7680d9
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commitcf0dd5bbad
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7f
Merge:ec6ed256f
89d433b41
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit89d433b41a
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6f
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit536401fe0f
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fb
Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2d
Merge:339bdddc3
cc9f1577a
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0c
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371e
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit2e60a457bf
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160b
Merge:b42801f6a
00b051b8c
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit00b051b8c7
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7e
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384f
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6ae
Merge:de4934f21
946129f20
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit946129f206
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commitd1aa11ec89
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commitde4934f21d
Merge:af06e4205
b10076b01
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commitb10076b015
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056
Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4b
Merge:beae8efb2
2ac1c1636
Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit2ac1c1636c
Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit004ecad059
Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21
Merge:d14ab7e3e
9839e5e56
Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit9839e5e566
Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1
Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commite7f74d94c1
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530
Merge:f88683766
8210da6e8
Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit8210da6e82
Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commitf88683766b
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8c
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffa
Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit7fb3a9b82c
Merge:9a2ed804c
ecb1e87fe
Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commitecb1e87fe6
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit9a2ed804ca
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commitd20fad28e5
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commitae813ddf75
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0c
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit9ee28c7513
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit1a8ba06702
Merge:0fd232e70
ee4d69b1c
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70d
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commitee4d69b1c5
Merge:31c535094
d1ad11194
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commitd1ad111949
Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit31c5350941
Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit7eb70e17e0
Merge:5bb4f271a
3dfcb4699
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit3dfcb46991
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3ba
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59f
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit5bb4f271aa
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>
716 lines
30 KiB
PHP
Executable file
716 lines
30 KiB
PHP
Executable file
@extends('layouts/default')
|
||
|
||
{{-- Page title --}}
|
||
@section('title')
|
||
{{ trans('admin/users/general.view_user', ['name' => html_entity_decode($user->present()->fullName(), ENT_QUOTES | ENT_XML1, 'UTF-8')]) }}
|
||
@parent
|
||
@stop
|
||
|
||
{{-- Page content --}}
|
||
@section('content')
|
||
|
||
<div class="row">
|
||
<div class="col-md-12">
|
||
<div class="nav-tabs-custom">
|
||
<ul class="nav nav-tabs hidden-print">
|
||
|
||
<li class="active">
|
||
<a href="#details" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-info-circle"></i>
|
||
</span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#asset" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-barcode" aria-hidden="true"></i>
|
||
</span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#licenses" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-floppy-o"></i>
|
||
</span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#accessories" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-keyboard-o"></i>
|
||
</span> <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#consumables" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-tint"></i></span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#files" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-paperclip"></i></span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
<li>
|
||
<a href="#history" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-clock-o"></i></span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
|
||
</a>
|
||
</li>
|
||
|
||
@if ($user->managedLocations()->count() >= 0 )
|
||
<li>
|
||
<a href="#managed" data-toggle="tab">
|
||
<span class="hidden-lg hidden-md">
|
||
<i class="fa fa-clock-o"></i></span>
|
||
<span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_locations') }}</span>
|
||
</a>
|
||
</li>
|
||
@endif
|
||
|
||
@can('update', $user)
|
||
<li class="dropdown pull-right">
|
||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
|
||
<i class="fa fa-gear"></i> {{ trans('button.actions') }}
|
||
<span class="caret"></span>
|
||
</a>
|
||
<ul class="dropdown-menu">
|
||
<li><a href="{{ route('users.edit', $user->id) }}">{{ trans('admin/users/general.edit') }}</a></li>
|
||
<li><a href="{{ route('clone/user', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li>
|
||
@if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')) && ($user->deleted_at==''))
|
||
<li><a href="{{ route('users.destroy', $user->id) }}">{{ trans('button.delete') }}</a></li>
|
||
@endif
|
||
</ul>
|
||
</li>
|
||
@endcan
|
||
|
||
@can('update', \App\Models\User::class)
|
||
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
|
||
<i class="fa fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a>
|
||
</li>
|
||
@endcan
|
||
</ul>
|
||
|
||
<div class="tab-content">
|
||
<div class="tab-pane active" id="details">
|
||
<div class="row">
|
||
@if ($user->deleted_at!='')
|
||
<div class="col-md-12">
|
||
<div class="callout callout-warning">
|
||
<i class="icon fa fa-warning"></i>
|
||
{{ trans('admin/users/message.user_deleted_warning') }}
|
||
@can('update', $user)
|
||
<a href="{{ route('restore/user', $user->id) }}">{{ trans('admin/users/general.restore_user') }}</a>
|
||
@endcan
|
||
</div>
|
||
</div>
|
||
@endif
|
||
<div class="col-md-2 text-center">
|
||
@if ($user->avatar)
|
||
<img src="/uploads/avatars/{{ $user->avatar }}" class="avatar img-thumbnail hidden-print" alt="{{ $user->present()->fullName() }}">
|
||
@else
|
||
<img src="{{ $user->present()->gravatar() }}" class="avatar img-circle hidden-print" alt="{{ $user->present()->fullName() }}">
|
||
@endif
|
||
</div>
|
||
|
||
<div class="col-md-8">
|
||
<div class="table table-responsive">
|
||
<table class="table table-striped">
|
||
@if (!is_null($user->company))
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.company') }}</td>
|
||
<td>{{ $user->company->name }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.name') }}</td>
|
||
<td>{{ $user->present()->fullName() }}</td>
|
||
</tr>
|
||
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.username') }}</td>
|
||
<td>{{ $user->username }}</td>
|
||
</tr>
|
||
@if (($user->address) || ($user->city) || ($user->state) || ($user->country))
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.address') }}</td>
|
||
<td>
|
||
@if ($user->address)
|
||
{{ $user->address }} <br>
|
||
@endif
|
||
@if ($user->city)
|
||
{{ $user->city }}
|
||
@endif
|
||
@if ($user->state)
|
||
{{ $user->state }}
|
||
@endif
|
||
@if ($user->country)
|
||
{{ $user->country }}
|
||
@endif
|
||
</td>
|
||
</tr>
|
||
|
||
@endif
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.groups') }}</td>
|
||
<td>
|
||
@if ($user->groups->count() > 0)
|
||
@foreach ($user->groups as $group)
|
||
|
||
@can('superadmin')
|
||
<a href="{{ route('groups.show', $group->id) }}" class="label label-default">{{ $group->name }}</a>
|
||
@else
|
||
{{ $group->name }}
|
||
@endcan
|
||
|
||
@endforeach
|
||
@else
|
||
--
|
||
@endif
|
||
|
||
</td>
|
||
</tr>
|
||
|
||
|
||
@if ($user->jobtitle)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.job') }}</td>
|
||
<td>{{ $user->jobtitle }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->employee_num)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.employee_num') }}</td>
|
||
<td>{{ $user->employee_num }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->manager)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.manager') }}</td>
|
||
<td>
|
||
<a href="{{ route('users.show', $user->manager->id) }}">{{ $user->manager->getFullNameAttribute() }}</a>
|
||
|
||
</td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->email)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.email') }}</td>
|
||
<td><a href="mailto:{{ $user->email }}">{{ $user->email }}</a></td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->website)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.website') }}</td>
|
||
<td><a href="{{ $user->website }}" target="_blank">{{ $user->website }}</a></td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->phone)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.phone') }}</td>
|
||
<td><a href="tel:{{ $user->phone }}">{{ $user->phone }}</a></td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if ($user->userloc)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.location') }}</td>
|
||
<td>{{ link_to_route('locations.show', $user->userloc->name, [$user->userloc->id]) }}</td>
|
||
|
||
|
||
</tr>
|
||
@endif
|
||
@if ($user->last_login)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.last_login') }}</td>
|
||
<td>{{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
@if (!is_null($user->department))
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.department') }}</td>
|
||
<td><a href="{{ route('departments.show', $user->department) }}">{{ $user->department->name }}</a></td>
|
||
</tr>
|
||
@endif
|
||
@if ($user->created_at)
|
||
<tr>
|
||
<td>{{ trans('general.created_at') }}</td>
|
||
<td>{{ $user->created_at->format('F j, Y h:iA') }}</td>
|
||
</tr>
|
||
@endif
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('general.login_enabled') }}</td>
|
||
<td>{{ ($user->activated=='1') ? trans('general.yes') : trans('general.no') }}</td>
|
||
</tr>
|
||
@if ($user->ldap_import!='1')
|
||
<tr>
|
||
<td class="text-nowrap">LDAP</td>
|
||
<td>{{ trans('general.yes') }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
|
||
@if ($user->activated=='1')
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/general.two_factor_active') }}</td>
|
||
<td>{{ ($user->two_factor_active()) ? trans('general.yes') : trans('general.no') }}</td>
|
||
</tr>
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/general.two_factor_enrolled') }}</td>
|
||
<td class="two_factor_resetrow">
|
||
<div class="row">
|
||
<div class="col-md-1" id="two_factor_reset_toggle">
|
||
{{ ($user->two_factor_active_and_enrolled()) ? trans('general.yes') : trans('general.no') }}
|
||
</div>
|
||
|
||
@if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0'))
|
||
<div class="col-md-11">
|
||
<a class="btn btn-default btn-sm pull-left" id="two_factor_reset" style="margin-right: 10px;"> {{ trans('admin/settings/general.two_factor_reset') }}</a>
|
||
<span id="two_factor_reseticon">
|
||
</span>
|
||
<span id="two_factor_resetresult">
|
||
</span>
|
||
<span id="two_factor_resetstatus">
|
||
</span>
|
||
|
||
<br><br><p class="help-block">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
|
||
</div>
|
||
</div>
|
||
@endif
|
||
|
||
</td>
|
||
</tr>
|
||
|
||
@endif
|
||
|
||
@if ($user->notes)
|
||
<tr>
|
||
<td class="text-nowrap">{{ trans('admin/users/table.notes') }}</td>
|
||
<td>{{ $user->notes }}</td>
|
||
</tr>
|
||
@endif
|
||
|
||
|
||
</table>
|
||
</div>
|
||
</div> <!--/col-md-8-->
|
||
|
||
<!-- Start button column -->
|
||
<div class="col-md-2">
|
||
@can('update', $user)
|
||
<div class="col-md-12">
|
||
<a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.edit') }}</a>
|
||
</div>
|
||
@endcan
|
||
|
||
@can('create', $user)
|
||
<div class="col-md-12" style="padding-top: 5px;">
|
||
<a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
|
||
</div>
|
||
@endcan
|
||
|
||
@can('view', $user)
|
||
<div class="col-md-12" style="padding-top: 5px;">
|
||
<a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">{{ trans('admin/users/general.print_assigned') }}</a>
|
||
</div>
|
||
@endcan
|
||
@can('delete', $user)
|
||
@if ($user->deleted_at=='')
|
||
<div class="col-md-12" style="padding-top: 5px;">
|
||
<form action="{{route('users.destroy',$user->id)}}" method="POST">
|
||
{{csrf_field()}}
|
||
{{ method_field("DELETE")}}
|
||
<button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
|
||
</form>
|
||
</div>
|
||
<div class="col-md-12" style="padding-top: 5px;">
|
||
<form action="{{ route('users/bulkedit') }}" method="POST">
|
||
<!-- CSRF Token -->
|
||
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||
<input type="hidden" name="ids[{{ $user->id }}]" value="{{ $user->id }}" />
|
||
<button style="width: 100%;" class="btn btn-sm btn-danger hidden-print">{{ trans('button.checkin_and_delete') }}</button>
|
||
</form>
|
||
</div>
|
||
@else
|
||
<div class="col-md-12" style="padding-top: 5px;">
|
||
<a href="{{ route('restore/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</a>
|
||
</div>
|
||
@endif
|
||
@endcan
|
||
</div>
|
||
<!-- End button column -->
|
||
</div> <!--/.row-->
|
||
</div><!-- /.tab-pane -->
|
||
|
||
<div class="tab-pane" id="asset">
|
||
<!-- checked out assets table -->
|
||
<div class="table-responsive">
|
||
<table class="display table table-striped">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-3">{{ trans('admin/hardware/table.asset_model') }}</th>
|
||
<th class="col-md-2">{{ trans('admin/hardware/table.asset_tag') }}</th>
|
||
<th class="col-md-2">{{ trans('general.name') }}</th>
|
||
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@if ($user->assets)
|
||
@foreach ($user->assets as $asset)
|
||
<tr>
|
||
<td>
|
||
@if (($asset->model) && ($asset->physical=='1'))
|
||
<a href="{{ route('models.show', $asset->model->id) }}">{{ $asset->model->name }}</a>
|
||
@endif
|
||
</td>
|
||
<td>
|
||
@can('view', $asset)
|
||
<a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->asset_tag }}</a>
|
||
@endcan
|
||
</td>
|
||
<td>{!! $asset->present()->nameUrl() !!}</td>
|
||
<td class="hidden-print">
|
||
@can('checkin', $asset)
|
||
<a href="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
||
@endcan
|
||
</td>
|
||
</tr>
|
||
@if($settings->show_assigned_assets)
|
||
@foreach ($asset->assignedAssets as $asset)
|
||
<tr>
|
||
<td>
|
||
@if ($asset->physical=='1')
|
||
<a href="{{ route('models.show', $asset->model->id) }}">{{ ' – '.$asset->model->name }}</a>
|
||
@endif
|
||
</td>
|
||
<td>
|
||
@can('view', $asset)
|
||
<a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->asset_tag }}</a>
|
||
@endcan
|
||
</td>
|
||
<td>{!! $asset->present()->nameUrl() !!}</td>
|
||
<td class="hidden-print">
|
||
@can('checkin', $asset)
|
||
<a href="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
||
@endcan
|
||
</td>
|
||
</tr>
|
||
@endforeach
|
||
@endif
|
||
@endforeach
|
||
@endif
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div><!-- /asset -->
|
||
|
||
<div class="tab-pane" id="licenses">
|
||
<div class="table-responsive">
|
||
<table class="display table table-hover">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-5">{{ trans('general.name') }}</th>
|
||
<th class="col-md-6">{{ trans('admin/hardware/form.serial') }}</th>
|
||
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@foreach ($user->licenses as $license)
|
||
<tr>
|
||
<td>
|
||
{!! $license->present()->nameUrl() !!}
|
||
</td>
|
||
<td>
|
||
@can('viewKeys', $license)
|
||
{!! $license->present()->serialUrl() !!}
|
||
@else
|
||
------------
|
||
@endcan
|
||
</td>
|
||
<td class="hidden-print">
|
||
@can('update', $license)
|
||
<a href="{{ route('licenses.checkin', array('licenseSeatId'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
||
@endcan
|
||
</td>
|
||
</tr>
|
||
@endforeach
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div><!-- /licenses-tab -->
|
||
|
||
<div class="tab-pane" id="accessories">
|
||
<div class="table-responsive">
|
||
<table class="display table table-hover">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-5">{{ trans('general.name') }}</th>
|
||
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@foreach ($user->accessories as $accessory)
|
||
<tr>
|
||
<td>{!!$accessory->present()->nameUrl()!!}</td>
|
||
<td class="hidden-print">
|
||
@can('checkin', $accessory)
|
||
<a href="{{ route('checkin/accessory', array('accessory_id'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
||
@endcan
|
||
</td>
|
||
</tr>
|
||
@endforeach
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div><!-- /accessories-tab -->
|
||
|
||
<div class="tab-pane" id="consumables">
|
||
<div class="table-responsive">
|
||
<table class="display table table-striped">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-8">{{ trans('general.name') }}</th>
|
||
<th class="col-md-4">{{ trans('general.date') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@foreach ($user->consumables as $consumable)
|
||
<tr>
|
||
<td>{!! $consumable->present()->nameUrl() !!}</td>
|
||
<td>{{ $consumable->created_at }}</td>
|
||
</tr>
|
||
@endforeach
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div><!-- /consumables-tab -->
|
||
|
||
<div class="tab-pane" id="files">
|
||
<div class="row">
|
||
|
||
<div class="col-md-12 col-sm-12">
|
||
<div class="table-responsive">
|
||
<table id="files-table" class="display table table-striped">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-5">{{ trans('general.notes') }}</th>
|
||
<th class="col-md-5"><span class="line"></span>{{ trans('general.file_name') }}</th>
|
||
<th class="col-md-2">{{ trans('general.download') }}</th>
|
||
<th class="col-md-2">{{ trans('general.delete') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@foreach ($user->uploads as $file)
|
||
<tr>
|
||
<td>
|
||
@if ($file->note)
|
||
{{ $file->note }}
|
||
@endif
|
||
</td>
|
||
<td>
|
||
{{ $file->filename }}
|
||
</td>
|
||
<td>
|
||
@if ($file->filename)
|
||
<a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">{{ trans('general.download') }}</a>
|
||
@endif
|
||
</td>
|
||
<td>
|
||
@can('update', $user)
|
||
<a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white" aria-hidden="true"></i><span class="sr-only">Delete</span></a>
|
||
@endcan
|
||
</td>
|
||
</tr>
|
||
@endforeach
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div>
|
||
</div> <!--/ROW-->
|
||
</div><!--/FILES-->
|
||
|
||
<div class="tab-pane" id="history">
|
||
<div class="table-responsive">
|
||
|
||
<table
|
||
data-click-to-select="true"
|
||
data-cookie-id-table="usersHistoryTable"
|
||
data-pagination="true"
|
||
data-id-table="usersHistoryTable"
|
||
data-search="true"
|
||
data-side-pagination="server"
|
||
data-show-columns="true"
|
||
data-show-export="true"
|
||
data-show-refresh="true"
|
||
data-sort-order="desc"
|
||
data-toolbar="#toolbar"
|
||
id="usersHistoryTable"
|
||
class="table table-striped snipe-table"
|
||
data-url="{{ route('api.activity.index', ['target_id' => $user->id, 'target_type' => 'user']) }}"
|
||
data-export-options='{
|
||
"fileName": "export-{{ str_slug($user->present()->fullName ) }}-history-{{ date('Y-m-d') }}",
|
||
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
||
}'>
|
||
<thead>
|
||
<tr>
|
||
<th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">Icon</th>
|
||
<th class="col-sm-3" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('general.date') }}</th>
|
||
<th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
|
||
<th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
|
||
<th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
|
||
<th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
|
||
</tr>
|
||
</thead>
|
||
</table>
|
||
|
||
</div>
|
||
</div><!-- /.tab-pane -->
|
||
|
||
<div class="tab-pane" id="managed">
|
||
<div class="table-responsive">
|
||
<table class="display table table-striped">
|
||
<thead>
|
||
<tr>
|
||
<th class="col-md-8">{{ trans('general.name') }}</th>
|
||
<th class="col-md-4">{{ trans('general.date') }}</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
@foreach ($user->managedLocations as $location)
|
||
<tr>
|
||
<td>{!! $location->present()->nameUrl() !!}</td>
|
||
<td>{{ $location->created_at }}</td>
|
||
</tr>
|
||
@endforeach
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div><!-- /consumables-tab -->
|
||
</div><!-- /.tab-content -->
|
||
</div><!-- nav-tabs-custom -->
|
||
</div>
|
||
</div>
|
||
|
||
@can('update', \App\Models\User::class)
|
||
@include ('modals.upload-file', ['item_type' => 'user', 'item_id' => $user->id])
|
||
@endcan
|
||
|
||
|
||
|
||
@stop
|
||
|
||
@section('moar_scripts')
|
||
@include ('partials.bootstrap-table', ['simple_view' => true])
|
||
<script nonce="{{ csrf_token() }}">
|
||
$(function () {
|
||
|
||
$("#two_factor_reset").click(function(){
|
||
$("#two_factor_resetrow").removeClass('success');
|
||
$("#two_factor_resetrow").removeClass('danger');
|
||
$("#two_factor_resetstatus").html('');
|
||
$("#two_factor_reseticon").html('<i class="fa fa-spinner spin"></i>');
|
||
$.ajax({
|
||
url: '{{ route('api.users.two_factor_reset', ['id'=> $user->id]) }}',
|
||
type: 'POST',
|
||
data: {},
|
||
headers: {
|
||
"X-Requested-With": 'XMLHttpRequest',
|
||
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
|
||
},
|
||
dataType: 'json',
|
||
|
||
success: function (data) {
|
||
$("#two_factor_reset_toggle").html('').html('{{ trans('general.no') }}');
|
||
$("#two_factor_reseticon").html('');
|
||
$("#two_factor_resetstatus").html('<i class="fa fa-check text-success"></i>' + data.message);
|
||
|
||
},
|
||
|
||
error: function (data) {
|
||
$("#two_factor_reseticon").html('');
|
||
$("#two_factor_reseticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
|
||
$('#two_factor_resetstatus').text(data.message);
|
||
}
|
||
|
||
|
||
});
|
||
});
|
||
|
||
|
||
//binds to onchange event of your input field
|
||
var uploadedFileSize = 0;
|
||
$('#fileupload').bind('change', function() {
|
||
uploadedFileSize = this.files[0].size;
|
||
$('#progress-container').css('visibility', 'visible');
|
||
});
|
||
|
||
$('#fileupload').fileupload({
|
||
//maxChunkSize: 100000,
|
||
dataType: 'json',
|
||
formData:{
|
||
_token:'{{ csrf_token() }}',
|
||
notes: $('#notes').val(),
|
||
},
|
||
|
||
progress: function (e, data) {
|
||
//var overallProgress = $('#fileupload').fileupload('progress');
|
||
//var activeUploads = $('#fileupload').fileupload('active');
|
||
var progress = parseInt((data.loaded / uploadedFileSize) * 100, 10);
|
||
$('.progress-bar').addClass('progress-bar-warning').css('width',progress + '%');
|
||
$('#progress-bar-text').html(progress + '%');
|
||
//console.dir(overallProgress);
|
||
},
|
||
|
||
done: function (e, data) {
|
||
console.dir(data);
|
||
// We use this instead of the fail option, since our API
|
||
// returns a 200 OK status which always shows as "success"
|
||
|
||
if (data && data.jqXHR && data.jqXHR.responseJSON && data.jqXHR.responseJSON.status === "error") {
|
||
var errorMessage = data.jqXHR.responseJSON.messages["file.0"];
|
||
$('#progress-bar-text').html(errorMessage[0]);
|
||
$('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-danger').css('width','100%');
|
||
$('.progress-checkmark').fadeIn('fast').html('<i class="fa fa-times fa-3x icon-white" style="color: #d9534f"></i>');
|
||
} else {
|
||
$('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-success').css('width','100%');
|
||
$('.progress-checkmark').fadeIn('fast');
|
||
$('#progress-container').delay(950).css('visibility', 'visible');
|
||
$('.progress-bar-text').html('Finished!');
|
||
$('.progress-checkmark').fadeIn('fast').html('<i class="fa fa-check fa-3x icon-white" style="color: green"></i>');
|
||
$.each(data.result, function (index, file) {
|
||
$('<tr><td>' + file.note + '</td><<td>' + file.filename + '</td></tr>').prependTo("#files-table > tbody");
|
||
});
|
||
}
|
||
$('#progress').removeClass('active');
|
||
|
||
|
||
}
|
||
});
|
||
});
|
||
</script>
|
||
|
||
|
||
@stop
|