3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 17:45:39 +00:00
Commit Graph

286 Commits

Author SHA1 Message Date
4caadcfa19 Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
dba837b1d2 Move location migration logic to trait 2024-02-22 13:21:52 -08:00
714fc63050 Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00
2df026bcb5 Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
aa2632fe46 Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
d7aed2edc9 Remove unneeded code 2024-02-14 11:10:45 -08:00
7bfd02054b Remove duplicate authorization check 2024-02-14 10:48:41 -08:00
51ae485f20 When asset is checked-in the assigned licenses also are taken from the user 2024-01-30 19:44:38 -06:00
742e183b02 Add guard against adding null values to query
Since $request->filled(null) returns true
2024-01-04 14:04:00 -08:00
8546407083 Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
f9139e0f10 Changed to use instanceof
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 13:25:32 +00:00
f13c1a53ef Get an object instead of a collection
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 12:51:35 +00:00
631dd58de1 Added model name and number to quickscan
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 04:23:04 +00:00
2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
d794608a09 note 2023-11-29 15:04:52 -06:00
c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06: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
6a3ab526de Refactorer API controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 18:04:24 +00:00
0d29ac9856 Fixded gate return
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 13:48:20 +00:00
a08dcbdfdb Quick revert for #13830
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 12:25:42 +00:00
000a28d648 Merge pull request #13830 from spencerrlongg/bug/sc-23921
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
2023-11-13 20:19:44 +00:00
7a638e4a65 RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int
Signed-off-by: snipe <snipe@snipe.net>
2023-11-03 14:06:27 +00:00
3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
05de8a5731 Re-added missing break
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:21:27 +01:00
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
96f7f49b68 Fixed response docblock
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
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
38de69b3da new validation rule 2023-10-18 12:41:24 -05:00
1be503b21a Make sure order number is not an array
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:36:16 +01:00
f7bb911b99 clean up 2023-10-17 19:06:53 -05:00
388e4c10c4 catch custom fields that are arrays 2023-10-17 19:03:58 -05:00
3f6554ee34 Use singleton for offset
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:23:43 +01:00
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
09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +01:00
4c3a306a6e More shuffling of scopes
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 13:35:41 +01:00
3cb0920411 Merge branch 'develop' into company-scoping 2023-06-26 12:32:10 -07:00
78d8e32a22 Fixed weird order number thing
Signed-off-by: snipe <snipe@snipe.net>
2023-06-22 21:16:24 +01:00
ab5fed09db Remove scopeCompanyables call from AssetsController@requestable 2023-06-22 12:36:43 -07:00
0a5e1e3190 Remove scopeCompanyables call from AssetsController@selectlist 2023-06-21 17:21:36 -07:00
fd55c99b87 Remove scopeCompanyables call from AssetsController@index 2023-06-21 16:29:44 -07:00