svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,178 Commits 118 Branches 300 Tags
develop
Commit Graph

79 Commits

Author SHA1 Message Date
snipe 144772cfbe Fixed tests 2026-06-08 21:41:22 +01:00
snipe 374f426f0c Bulk checkin (with optional delete) users: Tightened the gates to check for more specific checkin permissions 2026-06-08 20:30:43 +01:00
snipe d87cd7cbb9 Users Merge: Fixed FD-55767 - added canEditAuthFields for users in merge 2026-06-08 16:57:05 +01:00
snipe a161fa8519 Fix company syncing in bulk editing users 
If the target user belongs to [A, B, C] and the acting admin belongs to [B, C], only B and C get detached. Company A — which the acting admin can't see — is left untouched.
 2026-06-03 10:36:46 +01:00
snipe 3737b34913 Back-patch security fixes 2026-05-26 11:36:29 +01:00
snipe aa0eb24e80 Fixed merge mess 2026-05-26 11:15:30 +01:00
snipe 02488a62c1 Updated controllers 2026-05-26 11:03:55 +01:00
snipe 4127c6a0c0 Fixed FD-54447 - superuser on user bulk edit check for groups 2026-05-26 10:48:24 +01:00
snipe d74197aacc Disallow ldap_import and activated in bulk editing users if user doesn’t have permission 2026-05-26 10:47:40 +01:00
snipe c377b41198 Updated controllers 2026-05-20 14:58:18 +01:00
snipe 405540aea2 Clarified text 2026-04-11 10:38:42 +01:00
snipe ccfebee5f1 Not sure why the timestamps wouldn’t handle this for us, but… 2026-04-11 10:34:03 +01:00
snipe 1d9469a3df Fix action_date on action_logs on bulk checkin and delete 2026-04-11 10:32:04 +01:00
snipe 9bc92f57c8 Apply pint to non-API controllers 2026-03-13 16:45:30 +00:00
snipe 26347ac41e Add display name to bulk user edit 2026-01-13 12:00:46 +00:00
snipe a19c391aa1 Check can edit on demo in bulk user edit 2026-01-05 14:58:14 +00:00
snipe 03116f5ece Fixed tests 2025-12-17 16:16:58 +00:00
Marcus Moore be6caf936e Avoid logging consumable checkins 2025-03-12 11:48:14 -07:00
Marcus Moore b5fa538a54 Set created_by correctly in he action log 2025-03-11 16:05:02 -07:00
snipe d1cc0fcfac Added ability to send user inventory via bulk UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:07:54 +00:00
snipe e9ad43afbe Better hide reset password functionality for LDAP users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 18:51:08 +00:00
snipe 15a31bd141 Fixed variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-19 13:22:44 +00:00
snipe 3f0245f88f Make controller gate match dropdown gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 20:33:00 +01:00
snipe f6d7ea19e4 Set view as base permission, drill down for more intrusive actions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 19:44:39 +01:00
Marcus Moore 4b02db5031 Add authorization check in bulk users controller 2024-09-23 16:26:22 -07:00
Marcus Moore ab90c0cf05 Add missing eager load in bulk users controller 2024-09-23 16:10:40 -07:00
Marcus Moore a2d4dcf6e8 Use bulk actions menu 2024-09-23 12:49:36 -07:00
snipe 822ea96dfd Use auth()->id() instead of Auth::id() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:31:46 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
snipe 4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
snipe c5dbc5f6b8 Correctly save user’s city on bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 10:01:07 +01:00
snipe 22bc088f6f Added start_date and end_date to user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-27 07:21:19 +01:00
Marcus Moore d03baa4613 Make diff cleaner 2024-08-07 13:29:45 -07:00
Marcus Moore 41437e4d8f Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-07 13:06:59 -07:00
snipe 5546ab08c2 Only delete user records in accessories_checkouts for bulk delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 19:53:18 +01:00
Marcus Moore f2b78d18a4 Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-05 17:25:54 -07:00
Marcus Moore 17eccfcd8b Formatting 2024-08-05 16:58:27 -07:00
Marcus Moore 01e4382d20 Formatting 2024-08-05 16:58:17 -07:00
Marcus Moore 1c664af326 Remove todo outside of scope 2024-08-05 16:58:08 -07:00
Marcus Moore 392d34422a Remove code handled by ConsumableAssignment:: call above 2024-08-05 16:57:40 -07:00
Marcus Moore 67b3ab820f Add todo comments 2024-08-05 16:10:08 -07:00
Marcus Moore bfebcdc7ed Improve variable name 2024-08-05 15:22:35 -07:00
arne-kroeger b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
Marcus Moore 44dbbeb608 Add accessory and consumable specific checkin methods 2024-07-24 14:17:49 -07:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 59f66051f8 More eager loading 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:37 +01:00
snipe 574867536d Standardize query for merging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 19:41:34 +01:00
snipe a25263f868 Transfer files and acceptances on merge 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:49 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
snipe 3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00