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 |
|
snipe
|
9833d861d4
|
Added autoassign_licenses tp bulk users conditional
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:26:33 -07:00 |
|
snipe
|
e08327be95
|
Ability to remove user location from users
Rework of #9677 - sorry @godmartinez - I suck :(
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 23:03:57 -07:00 |
|
snipe
|
82dc57aa18
|
Renamed some variables, invoked the event listener
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-17 16:24:58 -07:00 |
|
snipe
|
9ac4efb912
|
Better commenting
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-17 16:24:38 -07:00 |
|
snipe
|
30cf7eb750
|
Disallow action in demo mode
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-17 02:42:50 -07:00 |
|
snipe
|
0dd11575c5
|
Added merge controller
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-16 18:19:16 -07:00 |
|
snipe
|
28b0d8cf0f
|
Null expected_checkin on user bulk checkin and delete
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 00:54:37 -07:00 |
|
Ivan Nieto Vivanco
|
0d4e9c183b
|
Save correct id in action log if the bulk-checkin is of type license
|
2022-08-25 19:16:48 -05:00 |
|
snipe
|
7313bca403
|
Checkin without deleting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-20 17:57:19 -07:00 |
|
snipe
|
f609146c29
|
Corrected field name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 15:37:10 -07:00 |
|
snipe
|
891009dc67
|
Nicer formatting for buttons in bulk user edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 15:35:57 -07:00 |
|
Brady Wetherington
|
b05d85ab0a
|
Fix bulk-user reset-password links
|
2022-05-16 10:38:12 -07:00 |
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
Ivan Nieto Vivanco
|
e1927aa154
|
Update Assets locations when user's location changes whey they got bulk-edited
|
2022-04-06 19:23:49 -05:00 |
|
Ivan Nieto Vivanco
|
6529a75683
|
Update Assets locations when user's location changes whey they got bulk-edited
|
2022-04-06 19:12:02 -05:00 |
|
snipe
|
9a358087ec
|
Add remote user to bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 06:47:23 -08:00 |
|
Ivan Nieto Vivanco
|
a419a690d4
|
Add a variable to better control the selected user's ids
|
2021-12-11 18:01:38 -06:00 |
|
Ivan Nieto Vivanco
|
9eaf89aaa7
|
Add a variable to better control the selected user's ids
|
2021-10-21 13:28:58 -05:00 |
|