Commit graph

11790 commits

Author SHA1 Message Date
snipe 7b9259274c
Merge pull request #13799 from inietov/fixes/unlogged_checkin_from_importer
Fixed #13795 Unlogged checkin action post updating the username of an asset through the CSV import
2023-10-26 13:33:51 +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 9d887484c8 Added encrypted custom field to seeder
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 07:41:25 +01:00
snipe c4c47f2e8d Updated comment
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:14 +01:00
snipe 0cebccac95 Removed extra logging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:07 +01:00
snipe c3b3aa4de6 Set one field to encrypted in the seeder
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:25:51 +01:00
snipe 3717d60170 Added two more custom fields/fieldsets to seeder
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 05:04:30 +01:00
snipe 6c996ac8fa Changed the seeder order to accomodate actionlog factory
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 05:03:59 +01:00
snipe 7042260871 More style polishing on custom fields in bulk edit
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:23:11 +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 77d141d19c Don’t check the delete expected checkin by detault
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 03:56:02 +01:00
snipe 436192b836 Fixed seeder
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:56:34 +01:00
snipe 522aa96fcc Changed error variable name
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:36:18 +01:00
snipe b87879f8e7 Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:35:53 +01:00
snipe 60e0e899bc Added show_in_requestable_list to factory
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:35:33 +01:00
snipe 6ebc01ca50 Bulk edit refactor
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:23 +01:00
snipe 4b6b36c639 Removed semicolon
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:14 +01:00
snipe 4a759f0a20 Added fingerprint icon for unique
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:01 +01:00
Ivan Nieto Vivanco ca1845efd7 Only log checkin event if the assigned_to property is not empty 2023-10-25 16:41:31 -06:00
Ivan Nieto Vivanco 7ed58a177b Evaluate if the asset was assigned to a different user than current target to log a checkin event 2023-10-25 16:31:23 -06:00
snipe d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add
adds employee number as a searchable field to the asset table
2023-10-25 21:04:54 +01:00
Godfrey M 1b614c13fb ugh 2023-10-25 13:03:42 -07:00
Godfrey M 56fd41eee4 removed erroneous code 2023-10-25 13:03:12 -07:00
Godfrey M 33b45898b1 adds to advancedsearch 2023-10-25 12:59:58 -07: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 0feb56d931 Removed period
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:39:15 +01:00
snipe a0cae77278 Fixed weird layout quirk on smaller screens
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:21:07 +01:00
snipe 0f97c0601b Nicer show/hide if encrypted, warn if already encrypted
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:11:06 +01:00
snipe 3916bac95f Added warning translation for encrypted fields
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:10:46 +01:00
snipe 6264d90459 Removed ending period for consistency
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:45:11 +01:00
snipe 57d3b2d2ef Check for encryption
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:10 +01:00
snipe a202bf81fa Removed column widths, check for encryption and showable
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:02 +01:00
snipe 43da292d60 Used short translation for sr-only text
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:34 +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 eb82bc290d Clarified translation
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:07 +01:00
snipe 8b9b46c562 Removed comment
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:59 +01:00
snipe 307f84dff8 Removed extraneous method
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:53 +01:00
snipe 3c6b79e807 Added new fields to blades
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:55 +01:00
snipe e5bd78a722 Added show_in_requestable_list validation, casting
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:35 +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 88661a58a7 Make field nullable
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:31 +01:00
snipe 08693f09b0 Added requests() method on Assets
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:22:12 +01:00