3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-08 09:28:47 +00:00
Commit Graph

139 Commits

Author SHA1 Message Date
afe6fe207a resolved, missed adding errors in a case 2023-06-28 16:45:18 -05:00
2a352619f7 clean up 2023-06-26 16:25:48 -05:00
691faf6340 ok, this kind of works - pr needs some clean up 2023-06-26 14:56:07 -05:00
f646623a5e Merge branch 'develop' into bulk_edit_custom_fields 2023-06-22 18:00:31 -05:00
8e3cbdad90 removes assigned_to if archived 2023-05-15 11:52:57 -07:00
5e34ffa2b0 wip 2023-05-10 14:08:12 -05:00
1d2596fc54 wip 2023-05-09 14:58:59 -05:00
815c77f943 wip 2023-05-03 14:49:31 -05:00
cdda4a56d8 aha, ok thisd kind of works 2023-05-02 19:11:43 -05:00
b2c2097e8b just more troubleshooting stuff, still no solution 2023-05-02 18:54:20 -05:00
52c9fefbe0 ok, this works except error display 2023-04-26 15:06:50 -05: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
6bec9cf880 fix a couple things 2023-04-25 23:26:16 -05:00
66ce02fc48 Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
2023-04-25 08:09:16 -07:00
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
52dc99588e pushing for now, needs validation work 2023-04-17 13:57:48 -05:00
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
0f72554a9f translations for messages 2023-03-30 13:57:18 -05:00
382d849ee1 added catch for no assets selected 2023-03-30 13:52:29 -05:00
e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
65bbecd145 this all works - could use some eyes 2023-03-29 14:46:31 -05:00
3271c9dc9f Fix #8208, #8896, #8985, #9789 2023-03-29 09:56:34 +02:00
032ae4348e custom fields display, need to get saving
+some clean up
2023-03-28 21:45:31 -05:00
804a788a27 initial fetch working 2023-03-28 20:31:24 -05:00
545d023a18 Handled a few more hard-coded strings
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:56:07 -07:00
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
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
60b70a4074 catch and redirect back with error 2023-03-14 16:07:09 -05:00
1f7ae08d76 Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
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
38cdcdf064 Eager load company 2023-02-06 10:59:51 -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
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
4eed2baa31 Added default tab to locations
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:06:58 -07:00
91e824c5b0 Check for nullifying checkboxes
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:07 -07:00
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
96b40a5edd Error 404 fixed on sumitting witout mandtory field 2022-08-02 18:44:16 +05:30
b035003546 Handled hardware route names
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
92d46edca3 Cleaned up logging output
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 13:33:58 -07:00
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
bf08e73f8f Removed comments and server side cookie info
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:36:09 -07: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
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
fe65de1207 implements cookie to maintain display preference 2022-06-01 11:54:05 +07:00
4eab5fd075 Removed older comments
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
6fc222a648 Fixed #11014 - Removed double escaping on custom fields
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:45:00 -07:00
dfd4d54433 Fixed route name
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 15:46:25 -07:00
220f94faee Check that the session key exists
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:10:47 -07:00