Ivan Nieto Vivanco
|
91b1cc7121
|
Move the early return to the controller instead of the Label model
|
2023-09-05 13:23:51 -06:00 |
|
snipe
|
fea11ec7f1
|
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
Bulk Editing Custom Fields
|
2023-08-22 12:40:18 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
slong753
|
ea61f634fb
|
get rid of nice nullsafe
|
2023-06-28 16:48:52 -05:00 |
|
|
slong753
|
afe6fe207a
|
resolved, missed adding errors in a case
|
2023-06-28 16:45:18 -05:00 |
|
|
slong753
|
2a352619f7
|
clean up
|
2023-06-26 16:25:48 -05:00 |
|
|
slong753
|
691faf6340
|
ok, this kind of works - pr needs some clean up
|
2023-06-26 14:56:07 -05:00 |
|
|
Spencer Long
|
f646623a5e
|
Merge branch 'develop' into bulk_edit_custom_fields
|
2023-06-22 18:00:31 -05:00 |
|
|
slong753
|
5e34ffa2b0
|
wip
|
2023-05-10 14:08:12 -05:00 |
|
|
slong753
|
1d2596fc54
|
wip
|
2023-05-09 14:58:59 -05:00 |
|
|
slong753
|
815c77f943
|
wip
|
2023-05-03 14:49:31 -05:00 |
|
|
slong753
|
cdda4a56d8
|
aha, ok thisd kind of works
|
2023-05-02 19:11:43 -05:00 |
|
|
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 |
|
|
snipe
|
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 |
|
|
slong753
|
6bec9cf880
|
fix a couple things
|
2023-04-25 23:26:16 -05:00 |
|
|
snipe
|
66ce02fc48
|
Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:09:16 -07:00 |
|
|
snipe
|
6e7f0728fd
|
Added more granular permissions on bulk actions for assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:06:45 -07: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
|
0f72554a9f
|
translations for messages
|
2023-03-30 13:57:18 -05:00 |
|
|
slong753
|
382d849ee1
|
added catch for no assets selected
|
2023-03-30 13:52:29 -05:00 |
|
|
slong753
|
e4c76f454c
|
this is good, just needs translations done in view
|
2023-03-29 18:24:56 -05:00 |
|
|
slong753
|
162b70d5a9
|
wireframed, needs a view and should work
|
2023-03-29 17:34:36 -05:00 |
|
|
slong753
|
65bbecd145
|
this all works - could use some eyes
|
2023-03-29 14:46:31 -05:00 |
|
Dominik Both
|
3271c9dc9f
|
Fix #8208, #8896, #8985, #9789
|
2023-03-29 09:56:34 +02: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
|
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
|
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 |
|
Cram42
|
7b29ddd283
|
Tie into tag generation
|
2022-11-01 20:02:12 +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
|
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
|
06a5ea1530
|
Fixed duplicate use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-01 18:57:45 -08:00 |
|
|
snipe
|
5fded57ec6
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
|
2022-02-01 18:53:05 -08:00 |
|
|
Ivan Nieto Vivanco
|
3ef775533a
|
Adds actionlog for bulk edits
|
2022-02-01 12:10:46 -06:00 |
|
|
Ivan Nieto Vivanco
|
2fec40d7df
|
Adds actionlog for bulk edits
|
2022-02-01 00:00:12 -06:00 |
|
|
snipe
|
aa8f1378c9
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
|
2021-10-20 17:26:41 -07:00 |
|
|
snipe
|
34eab88b7e
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 20:25:31 -07:00 |
|