1527679f4b
Handle deletions on the observer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 17:26:43 +01:00
c2fe3b5459
Use the observer to delete associated files and detach users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 17:00:38 +01:00
5108b1f3ed
Capture the log meta for what was changed
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:35:16 +01:00
d87da78eb5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-06-17 11:18:33 +01:00
90818bb147
Don't save next autoincrement base if it's going to fail, next
2024-06-03 15:58:57 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
63e733f0d6
changes from a note to a source
2024-01-30 15:14:59 -06:00
2deba17d91
that's all of 'em
2024-01-25 20:04:02 -06:00
3574ef5bb9
a few more imports, component sample
2024-01-25 19:54:53 -06:00
4a7df470f0
this works
2024-01-25 19:34:41 -06:00
c9101f4d97
initial work, not working yet
2024-01-25 18:18:24 -06:00
f922d0518e
Added allow list - quiet the observer down for magical laravel things
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 22:35:34 +00:00
d3175b2ca4
Removed remember token from changed
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:39:06 +00:00
a8123db4fb
Fixed comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:35:12 +00:00
b1e782d2f0
Small nits picked to make Brady happy
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:34:39 +00:00
22246dd099
Unset the specific arrays we don’t want to keep
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:50:46 +00:00
a7f76f9860
Hide certain fields from changelog
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:28:58 +00:00
8b79a8afdf
Added user observer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:22:05 +00:00
20c0f687e9
Added restored to asset observer, removed manual logging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:09:10 +00:00
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
...
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
2023-10-26 15:56:47 +01:00
9c90f03142
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:34:18 +01:00
c4c47f2e8d
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 06:51:14 +01:00
30cc498a16
Update AssetObserver.php
...
update exlicit marker depends if model EOL > 0 , EOL = 0
2023-10-22 18:23:30 +02:00
2537d0fdaf
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:34:46 +01:00
c14a01eb8b
Added comments to explain the potential race condition
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:18:19 +01:00
0368b9df43
viola
2023-09-13 17:16:17 -05:00
53d4fd1d0b
purchase_date
2023-09-12 18:01:33 -05:00
30dade1fba
cleanup
2023-09-11 17:35:12 -05:00
c66804bcee
a little cleanup
2023-09-11 17:22:46 -05:00
27bea2abb9
just some more wip on the importer
2023-09-11 17:21:51 -05:00
1b18cd7fe6
added asset_eol_date and explicit to factory
2023-09-11 17:21:51 -05:00
78c400e948
fix conflicts
2023-09-11 17:21:50 -05:00
8456b3ec0c
wip stuff
2023-09-11 16:51:40 -05:00
dc1a8840f1
Ensure empty string is not passed to strpos()
2023-08-14 16:40:34 -07:00
76191a09ed
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
2023-07-12 16:39:45 +01:00
39b1a5a8a0
Remove old cache key for settings
2023-01-09 16:19:25 -08:00
f8718ffc1e
Fixes observer fails when creating and assigning asset
2022-06-09 18:08:04 -05:00
1030ad9a27
Early returns if no change is made in the Asset so the 'update' action doesn't log
2022-06-06 22:00:05 -05:00
f977c53ecb
Fixes some issues in the asset observer
2022-06-06 19:14:32 -05:00
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
91694064fb
fixes double updates from action log and history
2022-04-18 11:30:24 -07:00
ff5a95a6a4
next_audit_date error on saving asset
...
Solved error 500 when saving new Asset and no next_audit_date is defined
2022-03-23 17:23:53 +01:00
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
f403db274a
(develop) Fix asset auto-incrementation ( #6806 )
...
* Fix auto-increment not updating
This is due to the addition of caching for settings. If we're not
explicitly saving the Settings model, then the cache isn't getting
updated, causing the asset tag auto-increment to get an old cached
version with the wrong number
* Move Setting cache clear to an observer
2019-03-13 10:58:35 -07:00
88b1da4260
Added: Caching of settings ( #6378 )
...
* Fixed missing oauth tables during setup.
* Cache settings
Cache the setting to reduce unnecessary database calls
2018-11-01 19:59:50 -07:00
8fb991110e
Fixed #4652 - asset not correctly checking out to user on creation
2018-01-17 12:10:28 -08:00
612f23f6e0
Added #2893 - track changes on asset edits
2017-12-12 04:59:28 -08:00
88ca852dcf
Cleaned up asset observer
2017-12-12 03:40:04 -08:00
16f57e16cb
Fixes #1190 - added basic audit workflow
2017-08-25 10:04:19 -07:00
