8902145288
This is a squashed branch of all of the various commits that make up the new HasCustomFields trait.
...
This should allow us to add custom fields to just about anything we want to within Snipe-IT.
Below are the commits that have been squashed together:
Initial decoupling of custom field behavior from Assets for re-use
Add new DB columns to Custom Fields and fieldsets for 'type'
WIP: trying to figure out UI for custom fields for things other than Assets, find problematic places
Real progress towards getting to where this stuff might actually work...
Fix the table-name determining code for Custom Fields
Getting it closer to where Assets at least work
Rename the trait to it's new, even better name
Solid progress on the new Trait!
WIP: HasCustomFields, still working some stuff out
Got some basics working; creating custom fields and stuff
HasCustomFields now validates and saves
Starting to yank the other boilerplate code as things start to work (!)
Got the start of defaultValuesForCustomField() working
More progress (squash me!)
Add migrations for default_values_for_custom_fields table
WIP: more towards hasCustomFields trait
Progress cleaning up the PR, fixing FIXME's
New, passing HasCustomFieldsTrait test!
Fix date formatter helper for custom fields
Fixed more FIXME's
2023-08-28 13:07:33 +01: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
5d4e704fac
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-21 09:26:54 +01:00
2d9ddab3f0
Moved logic for tighter constraints when ids are passed
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-21 09:24:17 +01:00
fbb7c55450
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
2023-05-04 03:12:36 -06:00
1b2d830380
Check if model exists before create asset via API
2023-05-01 16:05:03 -06:00
8f0b823fb3
Applies #12868
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 23:39:32 -07:00
22d73f503a
Merge pull request #12756 from dboth/develop
...
Fixed #8208 , #8896 , #8985 and #9789 : Currency issues when using non-english locales (resubmission)
2023-04-25 22:32:13 -07:00
64256351d8
Used a singleton to filter API limit value
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 08:46:39 -07:00
4cbb9c2409
Use abs() instead of max
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 17:28:25 -07:00
112a04b108
Better handle weird data passed to the API via limit and offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 11:28:46 -07:00
d10b7fd6af
Use firstorfail on eloquent query to return error if asset is not found
2023-03-29 19:11:28 -06:00
3271c9dc9f
Fix #8208 , #8896 , #8985 , #9789
2023-03-29 09:56:34 +02:00
77d513f80b
Assign target variable as the other checkout types
2023-03-28 17:25:57 -06:00
d70b7dbf41
Checks if exist on API checkout
2023-03-28 16:12:48 -06:00
418ce75a9f
Merge pull request #11431 from ntbutler-nbcs/develop
...
[Fix / Minor Change] Asset checkinbytag now consistent with existingAPI
2023-03-21 22:40:21 -07:00
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
8e00191b69
Add comment
2023-02-14 12:19:16 -08:00
a94f19a68e
Use name if provided by asset checkout request
2023-02-14 12:08:20 -08:00
41537a2449
Added field to the API controller endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:56:44 -08:00
378dc968b7
Derp. Copypasta
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 15:44:28 -08:00
0c39c7a53d
Updated blades to add byod as a “status”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 13:25:46 -08:00
ee4b8f4694
Added byod to API controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 13:03:31 -08:00
529b005d1e
We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 21:05:51 -08:00
7846251d25
Re-added return for no results (derp)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 20:43:57 -08:00
cc665d50ed
One more refactor, hopefully simplifying
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 20:40:12 -08:00
ae76d46f87
Small refactor to ALWAYS return deleted assets in a collection transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 20:23:05 -08:00
bf849128fc
Replicate the response behavior in the bySerial endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 19:57:47 -08:00
44be8c8f60
Determine which transformer to use based on number of assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 19:54:21 -08:00
7fcf6f2463
Removed deleted parameter
...
Signed-off-by: snipe <snipe@snipe.net >
2022-11-15 17:47:21 +00:00
2c5a0d370c
Clean up API byserial and bytag, allow deleted param
...
Signed-off-by: snipe <snipe@snipe.net >
2022-11-15 17:33:56 +00:00
bcbe517446
Added ability to include deleted items in tag search endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2022-11-15 17:18:09 +00:00
9a5d431962
Allow searching firectly for asset tag and serial
...
Signed-off-by: snipe <snipe@snipe.net >
2022-11-15 17:13:26 +00:00
78097df7ff
Aplpies current time to checkin date
...
Signed-off-by: snipe <snipe@snipe.net >
2022-07-21 21:45:25 -07:00
0617480f73
Asset checkinbytag now consistent with existingAPI
...
This is a non-breaking change to the checkinbytag endpoint to bring it
inline with the usage/formatting of the other bytag endpoints that
currently exist - using the URL path to define the asset_tag instead of
passing it through as a url query.
Both methods will work, but the URL Path method will take precidence if
it is used (the query will be ignored if included)
2022-06-30 09:23:52 +10:00
e28e7e37b8
Removed unneeded checks when searching for asset
2022-06-29 17:49:50 +10:00
67e9b7795a
Added asset checkoutByTag API endpoint
2022-06-29 16:11:57 +10:00
baad3b9d58
Only care about the converted name when updating the custom field itself
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-27 14:17:07 -07:00
675f42401c
Fixed #11343 - ability to null asset name
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-21 10:57:39 -07:00
cce5846018
Squashed commit of the following:
...
commit a070f7cd5e166f526304c1104147snipe@snipe.net >
Date: Thu Jun 9 17:23:05 2022 -0700
Merge pull request #11291 from snipe/fixes/regression_missing_restore_command
Fixed regression: missing restore option for assets via API
commit 4c11041477snipe@snipe.net >
Date: Thu Jun 9 17:17:38 2022 -0700
Fixed regression: missing restore option for assets via API
Signed-off-by: snipe <snipe@snipe.net >
Signed-off-by: snipe <snipe@snipe.net >
2022-06-09 17:23:50 -07:00
780222d372
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
646166b2b6
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-10 12:16:07 -07:00
9aac1cbba4
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
6b1329133b
Adds status ID to asset checkout API endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2022-04-15 13:06:35 +01:00
Brady Wetherington