DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-23 01:07:42 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11894 commits 89 branches 265 tags 290 MiB
Commit graph

4686 commits

Author SHA1 Message Date
snipe ee72c92d4f Fix for asset history with enfrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 03:00:49 +01:00
snipe 660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704 
Fixed exception being thrown when selected import was deleted
 2023-09-26 15:00:35 +01:00
snipe 279e6c7e4f Check for null company ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 14:33:42 +01:00
Marcus Moore 5a88a64ebd Remove unnecessary redirect 2023-09-20 17:35:34 -07:00
Marcus Moore b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
Godfrey M b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07: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 cbef531811 parse purchase date even though it's cast 2023-09-20 14:26:49 -05:00
spencerrlongg 7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
spencerrlongg c48a47936c add validation back in 2023-09-20 14:00:59 -05:00
Godfrey M 66abf8d5c0 redoing logic 2023-09-19 17:46:29 -07:00
spencerrlongg d65d1930e4 asset models 2023-09-19 19:24:53 -05:00
spencerrlongg 6b4f8f1813 rm duplicate fillable 2023-09-19 18:07:15 -05:00
spencerrlongg 929e107a20 rm byod from casts 2023-09-19 18:04:16 -05:00
snipe 0b562d2f55 Fixes #13609 - disallow sorting on age 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 15:25:52 +01:00
spencerrlongg 1cfd7673e0 change Importer.php back 2023-09-14 16:11:24 -05:00
snipe 2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled 
Fixed #13336 - Save unhashed password if no password provided
 2023-09-14 14:15:53 +01:00
snipe dcae5503c8 Use $attributes array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 13:52:57 +01:00
snipe d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping 
Added `CompanyableTrait` to `Department` model
 2023-09-14 12:52:53 +01:00
snipe b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
snipe c7b24821b3
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null 
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541)
 2023-09-14 12:50:54 +01:00
spencerrlongg 64a9859efd cleanup 2023-09-13 17:58:33 -05:00
Ivan Nieto Vivanco 439e031911 Evaluate if the event properties exists before run the CheckoutAcceptance query 2023-09-13 16:35:10 -06:00
spencerrlongg 0368b9df43 viola 2023-09-13 17:16:17 -05:00
spencerrlongg 951521dc81 push 2023-09-13 15:20:55 -05:00
Marcus Moore 11208ee064 Guard against attempting to send notification to model that isn't notifiable 2023-09-13 12:56:27 -07: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
spencerrlongg 7047869367 cleanup 2023-09-12 18:03:13 -05:00
spencerrlongg 53d4fd1d0b purchase_date 2023-09-12 18:01:33 -05:00
Ivan Nieto Vivanco 9cbd2d032c Add a boolean variable and condition to handle the call to checkedOutToUser() method 2023-09-11 17:40:59 -06:00
spencerrlongg 30dade1fba cleanup 2023-09-11 17:35:12 -05:00
spencerrlongg 431af5f530 this works!!!! 2023-09-11 17:34:05 -05:00
spencerrlongg 3e3bb594ea some import stuff 2023-09-11 17:34:04 -05:00
spencerrlongg fb001caee4 fix conflicts 2023-09-11 17:33:31 -05:00
spencerrlongg 3fb62874f0 quick push to check something else 2023-09-11 17:22:46 -05:00
spencerrlongg c66804bcee a little cleanup 2023-09-11 17:22:46 -05:00
slong753 27bea2abb9 just some more wip on the importer 2023-09-11 17:21:51 -05:00
slong753 1b18cd7fe6 added asset_eol_date and explicit to factory 2023-09-11 17:21:51 -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 20367eecc9 fix conflicts 2023-09-11 17:17:59 -05:00
slong753 cda9dd57dd asset update logic 2023-09-11 17:15:25 -05:00
slong753 41b65bd9a2 small changes 2023-09-11 17:15:25 -05:00
slong753 17a83129b9 this all needs to be tested tediously 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
slong753 8456b3ec0c wip stuff 2023-09-11 16:51:40 -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
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
Godfrey M 0eb50ceb3d removes commented code 2023-09-11 09:36:38 -07:00
snipe 06836663c8
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging 
Added validation around department_id in API patch request
 2023-09-07 21:36:20 +01:00
Marcus Moore 4caa501996 Relax property type check 2023-09-07 13:28:32 -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 7f892bf5ef
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect 
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
 2023-09-07 20:49:40 +01:00
Ivan Nieto Vivanco abd2ed3b81 Filter unaccepted assets that are not assigned to users 2023-09-07 13:39:16 -06:00
Marcus Moore 899c2eb19b Implement test case 2023-09-07 12:34:50 -07:00
snipe 894c34ff4f Update to only use relative paths 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-07 20:22:14 +01:00
Ivan Nieto Vivanco 1509c512a5 Add guard clauses around some License and LicenseSeat models functions 2023-09-06 11:54:11 -06:00
johnson-yi 5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog 2023-09-06 00:36:48 +00: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 e486fe2794 Removed soft-delete query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:10:20 +01:00
snipe f85df6bb8c Use same method of accessing companies as others 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:02:28 +01:00
snipe 2acf2b880e Account for hard-deleted models, suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 15:58:21 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +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 f08cef8664
Merge pull request #13556 from snipe/feature/sc-23684 
Added model name and number to dynamic url
 2023-08-31 18:23:33 +01:00
snipe e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk 
Removed Dusk
 2023-08-31 18:06:04 +01:00
snipe 83b178f5b2 Added model name and number to dynamic url 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-31 18:03:32 +01:00
snipe c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes 
Added eager loading for `changedinfo` and removed encrypted values from Asset history
 2023-08-31 13:04:39 +01:00
Marcus Moore 5828d29952 Remove Dusk 2023-08-30 16:43:18 -07:00
snipe 663faffcc1 Un-cast byod, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 19:13:55 +01:00
Ivan Nieto Vivanco 3cf9c1fea5 Adds a null coalescing operator to the license seat checkin notification 2023-08-30 11:57:29 -06:00
Ivan Nieto Vivanco 085a993340 Early return if no asset is found 2023-08-30 11:05:58 -06:00
snipe 2a93c38830 Don’t cast as boolean, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 16:40:28 +01:00
snipe b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675 
Fixed user search not adhering to company scoping
 2023-08-30 08:54:41 +01:00
Marcus Moore 806ab2cb9d Ensure users are scoped by company in index method 2023-08-29 16:17:29 -07:00
Godfrey Martinez d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable 2023-08-28 19:38:16 -07:00
Godfrey M 74f45a4473 reworks company queries for asset history 2023-08-28 19:35:46 -07:00
Ivan Nieto Vivanco 4e4ba38038 Pass the model_id variable in the controller and get it only if we are cloning the asset model 2023-08-28 16:23:26 -06:00
snipe 18ff810d7e Reverse orderof parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:51:52 +01:00
snipe baffcbad71 Set password property properly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:47:56 +01:00
snipe 611db4c0d2 Removed stray line 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:46:45 +01:00
Godfrey Martinez 92e88a0ae2
Merge branch 'develop' into ignore_encrypt_and_other_changes 2023-08-28 10:14:41 -07:00
Godfrey M e56628499c fixed lost changes 2023-08-24 11:45:23 -07:00
Godfrey M 2b7a899ef8 removed unnecessary code 2023-08-24 11:43:44 -07:00
Godfrey M 18cb514a53 revert unwanted changes 2023-08-24 10:40:44 -07:00
Godfrey M a3b6e0fbe6 adds some spacing 2023-08-24 10:36:09 -07:00
Godfrey M 34ba0c4440 adds id to history info 2023-08-24 10:36:08 -07:00
Godfrey M 739fc152c2 Adds readable asset history in the action log transformer 2023-08-24 10:36:08 -07:00
Godfrey M 011c09a3dd working on getting notifications 2023-08-24 10:35:40 -07:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07:00
Marcus Moore e32c07be02 Clear commented log statements 2023-08-24 08:15:40 -07:00
Marcus Moore 5a0b0522b0 Explicitly declare $clean_meta variable 2023-08-24 08:15:07 -07:00
Ivan Nieto Vivanco 6161a0d76d Add condition in LicenseCheckinController:bulkCheckin method to evaluate if the license is reassignable 2023-08-23 16:22:40 -06:00
Godfrey Martinez 28cf533d19
Merge branch 'develop' into ignore_encrypt_and_other_changes 2023-08-23 00:42:59 -07:00
Godfrey M 0fc79ec936 fixes conflicts 2023-08-23 00:40:59 -07:00
Godfrey M ffe1b11419 merged develop 2023-08-23 00:38:58 -07:00
Godfrey M 27488c1009 adds soft deletes to eager loading 2023-08-23 00:34:09 -07:00
Godfrey M ce60db009c adds soft deletes to eager loading 2023-08-23 00:32:43 -07:00
Marcus Moore bee680683d Add withTrashed to asset model query 2023-08-22 17:05:06 -07:00
Godfrey M 92ddf8fc67 removed dead space 2023-08-22 12:38:50 -07:00
Godfrey M 1019287c76 retarget key 2023-08-22 12:36:43 -07:00
Godfrey M 9e438c3ed0 eager loaded changedInfo queries, reworked encrypted data change log changes 2023-08-22 12:34:45 -07:00
Godfrey M c7f2acf2c6 removes encrypted info from change log, renames asset_eol_date in the change log 2023-08-22 11:39:38 -07: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 a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue 
Fixed #13317 Accessories declined by user remain assigned
 2023-08-22 12:42:55 +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
snipe 303b45c9e9
Merge pull request #13485 from Godmartinz/history_info_clean_up 
Added better handling of information of asset history
 2023-08-22 12:25:17 +01:00
Marcus Moore 4e2ef4f056 Default to using the current date if last check in end date is not provided 2023-08-21 14:35:15 -07:00
snipe 79a4d915db
Merge pull request #13456 from marcusmoore/fixes/auto-incrementing-on-74 
Fixed passing invalid argument to `strpos()`
 2023-08-21 22:25:52 +01:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
Godfrey M b54aaefefb adds some spacing 2023-08-21 13:43:06 -07:00
Godfrey M 5076b45a0d adds id to history info 2023-08-21 13:40:39 -07:00
snipe bfd674b622 Switched to getFullNameAttribute() from fullName() in User Presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:12:25 +01:00
snipe 354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
snipe f3460b5a4f Switch to getFullNameAttribute() in user transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:48 +01:00
snipe 474c03e3fc Added name order to settings save controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:03 +01:00
Marcus Moore 489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
snipe 45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe ffc7c4e99a use number format to constrain large number displays 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:09 +01:00
snipe 1e82c2bfad Changed example asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:17:54 +01:00
snipe d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe 1dcca14c37 Values are not sortable, so don’t show them as sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:21:54 +01:00
snipe d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe 0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00
snipe da2f22d504 Fixed #13487 - include supplier url in listing 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 15:31:15 +01:00
Godfrey M a62876d4bc Adds readable asset history in the action log transformer 2023-08-17 16:14:01 -07:00
snipe 0ee032a10d
Merge pull request #13391 from Godmartinz/ldap_sync_field_clear_bug 
Fixed Ldap sync field clear bug
 2023-08-17 17:45:03 +01:00
snipe 03a01c02c4
Merge pull request #13483 from inietov/fixes/default_locations_advanced_search 
Fixed #13359 Advanced search by Default Location does not work
 2023-08-17 15:15:21 +01:00
Ivan Nieto Vivanco b607a59875 Add query to search default locations in advanced search 2023-08-16 15:04:17 -06:00
snipe 34f2221b02
Merge pull request #13471 from inietov/fixes/components_search 
Fixed #13409 Search in component detail view not working
 2023-08-16 21:59:40 +01:00
Brady Wetherington 852e9ff311 Accessory checkin via API reported wrong target user 2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco 92df32dfaa Move a couple assignation of variables inside an else to only execute once 2023-08-15 21:10:48 -06:00
snipe 027afa71f1 Check that there is a company before trying to get name property 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-16 01:09:22 +01:00
Ivan Nieto Vivanco 993918f47c Add query to search into the per-component view 2023-08-15 15:31:36 -06:00
snipe 01ab360ef3 Fixed accessory clone typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:09 +01:00
snipe 9af850dbaa Re-apply a change that was dropped 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:47 +01:00
snipe 64342838fd Return the user to the labels page on save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:12 +01:00
snipe 443adc50da Fixed unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:12:25 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00