3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 02:05:51 +00:00
Commit Graph

213 Commits

Author SHA1 Message Date
9600adee6b Don't allow viewing edit page if user soft deleted 2025-05-15 11:14:15 -07:00
5bae74bc1b Merge pull request #16688 from 36864/patch-1
Fixes #14734: Only show signatures for the printed user
2025-04-19 14:36:26 +01:00
9ad99c1d81 Merge pull request #16494 from marcusmoore/bug/sc-28675
Avoid logging consumable checkins and purge action log of bad entries
2025-04-19 14:24:52 +01:00
06fc140626 Optimize eager loading of log entries 2025-04-11 16:27:29 +00:00
9aede45918 Remove unneeded eager loads 2025-03-17 14:43:23 -07:00
be6caf936e Avoid logging consumable checkins 2025-03-12 11:48:14 -07:00
b5fa538a54 Set created_by correctly in he action log 2025-03-11 16:05:02 -07:00
a09a9d3cd6 Added item to payload
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 15:26:25 +00:00
a5009aa7df Added withTrashed() to handle soft deletes with RMB
Signed-off-by: snipe <snipe@snipe.net>
2025-02-24 13:38:06 +00:00
7a77de6ffe Don’t delete avatar file on soft-delete
Signed-off-by: snipe <snipe@snipe.net>
2025-02-22 12:49:04 +00:00
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
80394ef788 Revert delete because route model binding + resources routes + soft deletes = sux0r
Signed-off-by: snipe <snipe@snipe.net>
2025-02-20 12:29:37 +00:00
f7d213052a Route model binding for resource groups
Signed-off-by: snipe <snipe@snipe.net>
2025-02-19 02:49:05 +00:00
d5309c7d94 Added fragment to uploads for redirect
Signed-off-by: snipe <snipe@snipe.net>
2025-01-21 18:06:00 +00:00
e9ad43afbe Better hide reset password functionality for LDAP users
Signed-off-by: snipe <snipe@snipe.net>
2025-01-17 18:51:08 +00:00
15a31bd141 Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
2024-11-19 13:22:44 +00:00
2db70379a6 Fix Indentation in UsersController
The indentation in the update-function of the UsersController is partially wrong.
Fix this to avoid confusion.
2024-11-07 09:22:42 +01:00
787e651778 Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net>
2024-10-21 16:52:21 +01:00
ef9b6e3b07 Code cleanup
Signed-off-by: snipe <snipe@snipe.net>
2024-10-21 16:34:54 +01:00
c01190fac2 Conditionally add content-type
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:18:34 +01:00
c49abb6aea Refactor the UserFilesController show method for simpler inlining
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:08:38 +01:00
ccd2019448 Removed unusded use statements
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:08:04 +01:00
3f0245f88f Make controller gate match dropdown gate
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 20:33:00 +01:00
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
9b03f46490 Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
2024-09-25 19:32:01 +01:00
1c3babacaf Fixed case on logAction for usewr file upload
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 15:46:57 +01:00
4b02db5031 Add authorization check in bulk users controller 2024-09-23 16:26:22 -07:00
ab90c0cf05 Add missing eager load in bulk users controller 2024-09-23 16:10:40 -07:00
cef7ddc719 Add eager loads to userscontroller 2024-09-23 16:10:21 -07:00
a2d4dcf6e8 Use bulk actions menu 2024-09-23 12:49:36 -07:00
54044bfa5e Add eager loads 2024-09-23 10:57:57 -07:00
29af210f4f Merge branch 'develop' into bulk-print-users 2024-09-23 10:26:20 -07:00
5128fd49e6 Allow printing all users 2024-09-19 17:27:25 -07:00
2d2d5bdc7e Pass user in array 2024-09-19 17:23:47 -07:00
e95703cb18 Use eager load 2024-09-19 17:10:07 -07:00
7ad4a29970 Add eager loading 2024-09-19 16:54:39 -07:00
822ea96dfd Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:31:46 +01:00
1582d81e5b Change user_id to created_by
Signed-off-by: snipe <snipe@snipe.net>
2024-09-17 22:16:41 +01:00
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
c5dbc5f6b8 Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
2024-09-09 10:01:07 +01:00
c197644ba7 Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
2024-08-29 11:38:15 +01:00
b06c527767 Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net>
2024-08-29 11:06:30 +01:00
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
a8cd1027f3 rm commented code 2024-08-20 11:40:15 -05:00
20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
120cfd13c5 translation 2024-08-13 14:07:40 -05:00
09f2739298 works, un-reassignable licenses are an issue 2024-08-13 13:45:41 -05:00
ec863df007 rm conditional that might be unnecessary 2024-08-12 16:58:53 -05:00
cc3b8e0681 this should more or less work, but i need to determine if this is the best way 2024-08-12 16:58:21 -05:00
ff145abbe7 use array for eager loading, makes ide prettier 2024-08-12 16:13:03 -05:00