Commit graph

3309 commits

Author SHA1 Message Date
snipe
fe2cfa0d38 Redirect if category is missing or invalid
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:28:44 +00:00
spencerrlongg
c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
spencerrlongg
0924a53789 quick fix 2023-11-15 12:28:30 -06:00
snipe
4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769
Changed data source input to select in new label engine
2023-11-13 20:38:42 +00:00
snipe
4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations
Added multi location sync for ldap
2023-11-13 20:20:45 +00:00
snipe
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
snipe
ef10f2e50e Use more correct route in redirect
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:38 +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
bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922
New Translation Strings for Custom Asset Export
2023-11-08 08:57:20 +00:00
snipe
44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932
Fixed notes not saving to action log when licenses are checked in/out
2023-11-08 08:53:00 +00:00
Marcus Moore
a08e0bd547 Ensure notes are saved to the action log when licenses are checked in and out 2023-11-06 12:20:13 -08:00
snipe
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
Godfrey M
3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
spencerrlongg
d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg
e05af5216e formatting 2023-11-01 12:14:46 -05:00
spencerrlongg
3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
spencerrlongg
53bd5626c9 this works, need to write up pr 2023-11-01 11:33:29 -05:00
spencerrlongg
8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
spencerrlongg
b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
snipe
f822f8b186 More graceful failure if ldap_results JSON decode isn’t set
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 17:09:18 +00:00
snipe
57372fc82a Correctly call the validator in the response if it fails
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:30:38 +00:00
snipe
3495652827 Added checkboxes to intentionally remove field values in bulk user edit
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:52:53 +00:00
snipe
96211cf73c Add additional fields to Download All in Activity Report
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 09:43:47 +00:00
spencerrlongg
90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
spencerrlongg
f12d44509e asset_eol_date should always be filled now 2023-10-26 14:39:02 -05:00
spencerrlongg
91b53bffa1 resolved 2023-10-26 14:23:31 -05: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
7b2f49644e Use nothing instead of null to make it consistent
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:44:17 +01:00
snipe
305cd9b0b8 Use null instead of blank
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:42:49 +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
c1213e0abc Nicer handling for empty custom fields
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:41:44 +01:00
snipe
05de8a5731 Re-added missing break
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:21:27 +01:00
snipe
ff72c4fbaa Added nicer formatting for fields in log meta
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:17:28 +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
7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +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
snipe
ab3edae0b6 Reverted buttons (this re-introduces the n+1 problem.)
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:09 +01:00
snipe
887d013a39 Added listable fields in profile -> requested assets
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:33 +01:00
snipe
23a6547ada Added custom fields, fixed n+1
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:14 +01:00
snipe
63a86c5622 Added field to controller
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:27:36 +01:00
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
Robert-Azelis
5ae09b791f
Update AssetsTransformer.php
on list of assets display EOL rate in months if purchase date and eol date are set, otherwise null (not display anything)
2023-10-22 18:16:49 +02: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