slong753
b2c2097e8b
just more troubleshooting stuff, still no solution
2023-05-02 18:54:20 -05:00
slong753
52c9fefbe0
ok, this works except error display
2023-04-26 15:06:50 -05:00
slong753
6bec9cf880
fix a couple things
2023-04-25 23:26:16 -05:00
slong753
52dc99588e
pushing for now, needs validation work
2023-04-17 13:57:48 -05:00
slong753
8b9aea8874
very much WIP, but dupe queries reduced
...
but i think this can be cleaned up a bit more
2023-04-12 14:46:48 -05:00
slong753
65bbecd145
this all works - could use some eyes
2023-03-29 14:46:31 -05:00
slong753
032ae4348e
custom fields display, need to get saving
...
+some clean up
2023-03-28 21:45:31 -05:00
slong753
804a788a27
initial fetch working
2023-03-28 20:31:24 -05:00
snipe
545d023a18
Handled a few more hard-coded strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:56:07 -07:00
snipe
c229d69cec
Added next audit date override in bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 16:01:41 -07:00
snipe
f9e190eb32
Updates the Gate “use” statement to be more specific
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-18 11:58:09 -07:00
slong753
60b70a4074
catch and redirect back with error
2023-03-14 16:07:09 -05:00
snipe
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
snipe
3e47d9e689
Pass the existing asset name to the bulk checkout form
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-24 09:54:46 -08:00
Marcus Moore
38cdcdf064
Eager load company
2023-02-06 10:59:51 -08:00
snipe
41537a2449
Added field to the API controller endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:56:44 -08:00
snipe
b80d52a9c3
Added byod to asset controller for create and update methods
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:03:51 -08:00
snipe
4eed2baa31
Added default tab to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:06:58 -07:00
snipe
91e824c5b0
Check for nullifying checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:07 -07:00
snipe
1b657ee995
Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout
...
Error 404 fixed on submitting without mandatory field
2022-08-02 17:19:22 -07:00
vishalkumar183
96b40a5edd
Error 404 fixed on sumitting witout mandtory field
2022-08-02 18:44:16 +05:30
snipe
b035003546
Handled hardware route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
snipe
92d46edca3
Cleaned up logging output
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 13:33:58 -07:00
snipe
14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value
...
Only care about the custom field's converted name when updating the custom field itself
2022-06-27 17:36:26 -07:00
snipe
bf08e73f8f
Removed comments and server side cookie info
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:36:09 -07:00
snipe
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
snipe
d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
...
Fixes #8155 - improve the workflow during asset creation
2022-06-24 18:53:07 -07:00
Achmad Fienan Rahardianto
fe65de1207
implements cookie to maintain display preference
2022-06-01 11:54:05 +07:00
snipe
4eab5fd075
Removed older comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
6fc222a648
Fixed #11014 - Removed double escaping on custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:45:00 -07:00
snipe
dfd4d54433
Fixed route name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 15:46:25 -07:00
snipe
220f94faee
Check that the session key exists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:10:47 -07:00
snipe
22ec3c1398
Use error style instead of warn/info when nothing was selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:52 -07:00
snipe
caf17d4f25
Fixed wrong variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:32 -07:00
snipe
e1b24bb763
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:30:21 -07:00
snipe
76213ec3d9
Create a session on bulk actions, store it for redirect, then delete it
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:08 -07:00
snipe
243739e9c3
Added missing gate for bulk checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:13:36 -07:00
snipe
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
snipe
2e9cf8fa87
Added access gate to the requested assets index
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-28 15:45:37 +01:00
Godfrey M
3eb7a87a66
fixes action_date for check-in not including H:i:s
2022-04-07 11:24:12 -07:00
Godfrey M
1325628039
fixes typo
2022-04-07 11:18:16 -07:00
Godfrey M
8498082f21
fixes typo
2022-04-07 11:16:40 -07:00
Godfrey M
6dc45c189b
removed deadspace
2022-04-07 11:10:36 -07:00
Godfrey M
5d0a1ebb7a
fixes action_date for check-in not including H:i:s
2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco
319d816002
Update in the license seat the user that the asset with that license have assigned
2022-03-21 15:06:43 -06:00
snipe
df60729140
Fixed #10769 - redirect user back to due for audit page
...
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 14:27:18 +00:00
snipe
7db252ade3
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:11:42 +00:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
snipe
3e2fe10480
Fixed getAssetBySerial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-05 09:03:29 -08:00
snipe
ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
...
Added #10454 : Quick Scan Checkin
2022-02-01 20:19:45 -08:00
