Commit graph

196 commits

Author SHA1 Message Date
snipe 20c0f687e9 Added restored to asset observer, removed manual logging
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 20:09:10 +00:00
snipe e2d0136336 Fixed goofy translation
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:14:44 +00:00
snipe f7ccef16e7 Refactorer controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:02:47 +00:00
snipe 08153d418f Use new alert box and linked string
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:18 +00:00
snipe 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
snipe 9bba0b764a Added clearer comments
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:38:39 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe 0cebccac95 Removed extra logging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:07 +01:00
snipe 2695576968 Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:20 +01:00
snipe f25ddee857 Removed debugging, use new model rules if model has changed
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:14 +01:00
snipe 541ba0c0ba Removed conditional add for model_id
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:20:52 +01:00
snipe b87879f8e7 Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:35:53 +01:00
snipe 6ebc01ca50 Bulk edit refactor
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:23 +01:00
snipe da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
Robert-Azelis bd195a6911
Update AssetsController.php
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
2023-10-22 18:11:19 +02:00
snipe f685ba01b6 Reversed order of find
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:43:14 +01:00
snipe e5f5802235 Added tighter controls for matching log ID and item_id
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 15:17:03 +01:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe 279e6c7e4f Check for null company ID
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 14:33:42 +01:00
spencerrlongg 4660a2e5b7 rm more duplicate 2023-09-20 14:37:32 -05:00
spencerrlongg a9123754f5 remove unnecessary code 2023-09-20 14:34:42 -05:00
spencerrlongg 7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
spencerrlongg 70a251de55 fix up gui edit 2023-09-13 13:51:14 -05:00
spencerrlongg e21a8b6717 fix up this file 2023-09-12 18:11:36 -05:00
slong753 78c400e948 fix conflicts 2023-09-11 17:21:50 -05:00
slong753 75d7e3e1a0 fix conflicts 2023-09-11 17:20:21 -05:00
slong753 5948679a4a fix purchase date update 2023-09-11 17:17:59 -05:00
slong753 774f21bb7f some more cleanup 2023-09-11 17:17:59 -05:00
slong753 cda9dd57dd asset update logic 2023-09-11 17:15:25 -05:00
slong753 1ea0de8bca prevent injection, fix asset update 2023-09-11 17:15:25 -05:00
slong753 17ccfa9ada resolve some conflicts 2023-09-11 17:15:24 -05:00
slong753 c1daabef08 progress 2023-09-11 17:10:41 -05:00
Godfrey M e73b16846e adds an option to bulk edit actual location for bulk edit and fixes update issue 2023-09-11 11:21:56 -07:00
snipe 02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
Fixed #13562 - Added inline file link
2023-09-07 20:50:13 +01:00
snipe a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541)
2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco 91b1cc7121 Move the early return to the controller instead of the Label model 2023-09-05 13:23:51 -06:00
snipe d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog
Added/Fixed: track changes on asset checkin/out
2023-09-05 19:08:49 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 18:28:01 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
Added last check in column and filter to custom asset report
2023-09-05 13:22:15 +01:00
Johnson Yi 09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
snipe 79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
Fixed Asset acceptance error when user company and asset company don't match
2023-08-22 15:49:56 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
Bulk Editing Custom Fields
2023-08-22 12:40:18 +01:00
Marcus Moore 489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
Ivan Nieto Vivanco 053d3fc9ed Prevent asset to be checked out if full company support is enabled and companies not match 2023-08-02 19:23:28 -06:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page
Delete button on asset view page
2023-07-25 12:11:35 +01:00
Ivan Nieto Vivanco 9591442f1e Evaluate the radio input to update location only or default location too 2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco 743e852998 Add radio buttons to alter asset checkin location behavior 2023-07-06 10:38:48 -06:00
Ivan Nieto Vivanco 011726154c Set rtd_location if a location is given at checkin 2023-06-29 03:16:59 -06:00
slong753 ea61f634fb get rid of nice nullsafe 2023-06-28 16:48:52 -05:00