Commit graph

2476 commits

Author SHA1 Message Date
snipe 933ce61efd Removed eager loading for defaultLoc, added requests loading, sorting
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:51 +01:00
snipe 96f7f49b68 Fixed response docblock
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
snipe 38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355
Fixed ErrorException: Array to String Conversion rb17355
2023-10-18 19:09:13 +01:00
spencerrlongg 38de69b3da new validation rule 2023-10-18 12:41:24 -05:00
snipe 1be503b21a Make sure order number is not an array
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:36:16 +01:00
snipe 4d841dbc79 Use custom report validator
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:13:25 +01:00
spencerrlongg f7bb911b99 clean up 2023-10-17 19:06:53 -05:00
spencerrlongg 388e4c10c4 catch custom fields that are arrays 2023-10-17 19:03:58 -05:00
snipe 3f6554ee34 Use singleton for offset
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:23:43 +01:00
Marcus Moore 417f9c21e4 Fix the storing of group permissions when creating via API 2023-10-10 17:51:29 -07:00
snipe f685ba01b6 Reversed order of find
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:43:14 +01:00
snipe e3591dc756
Merge pull request #13728 from snipe/fixes/13725_for_dev
Fixes qty remaining requirements for component checkout via API
2023-10-09 16:34:40 +01:00
snipe b9dc7f88d0 Fix qty requirements for Components API checkout
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:32:30 +01:00
snipe 866bbe5e11 Removed extra debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:15:14 +01:00
snipe 6d55d78280 Set resend acceptance to POST
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:13:41 +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 cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
Godfrey M c69958d95d removed dead space 2023-10-03 12:32:24 -07:00
Godfrey M 92776adb93 remove unnecessary changes 2023-10-03 12:31:58 -07:00
Godfrey M dee36fc294 adds component checkin to asset tab 2023-10-03 12:30:08 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe 0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778
Fixed uncaught type error when attempting to render barcodes with invalid characters
2023-09-29 01:50:07 +01:00
Marcus Moore 41eccaeae0 Set dummy asset tag to value that is valid for EAN13 2023-09-28 17:31:45 -07:00
snipe f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596
Fieldset Properly Sortable in Asset Models Table
2023-09-28 19:24:04 +01:00
spencerrlongg a54fab5c33 add fieldset to allowed_columns 2023-09-28 13:02:12 -05:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
snipe 6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:40:18 +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 d65d1930e4 asset models 2023-09-19 19:24:53 -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 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
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
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
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 Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -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
Ivan Nieto Vivanco abd2ed3b81 Filter unaccepted assets that are not assigned to users 2023-09-07 13:39:16 -06:00
snipe 894c34ff4f Update to only use relative paths
Signed-off-by: snipe <snipe@snipe.net>
2023-09-07 20:22:14 +01:00