ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,510 Commits 84 Branches 293 Tags
d65c0c8bea2bd6dd4ecbb84c9e6be3487944a305
Commit Graph

4919 Commits

Author SHA1 Message Date
Marcus Moore 530ea474d1 Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
 2024-01-23 13:55:07 -08:00
Marcus Moore b74115b604 Add docblocks 2024-01-18 15:42:52 -08:00
Marcus Moore 1630392953 Uncheck a couple boxes by default to match existing behavior 2024-01-18 13:30:51 -08:00
Marcus Moore f64aa4dfd4 Improve variable name 2024-01-18 11:58:34 -08:00
Marcus Moore 786c41ad79 Add some type hints 2024-01-17 17:41:03 -08:00
Marcus Moore b24d80680e Add clarifying comments 2024-01-17 17:32:35 -08:00
Marcus Moore 691e81d827 Implement some tests 2024-01-17 16:25:28 -08:00
Marcus Moore 82f4cc799b Improve variable name 2024-01-17 11:54:37 -08:00
Marcus Moore 0883321d9e Only limit template creator scope when authenticated 2024-01-17 11:24:38 -08:00
snipe adba2d5b6c Remove 7 day padding for expected assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-15 16:11:31 +00:00
Marcus Moore d72970b5b6 Add global scope to limit template to current user 2024-01-11 13:59:51 -08:00
snipe 66c24e152f Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation 
Fixed [FD-39640]: preserve sort order when generating asset labels
 2024-01-11 21:46:01 +00:00
Marcus Moore e5fb888d67 Implement test 2024-01-11 13:34:20 -08:00
akemidx a5099b5163 translations/messages on report template controller 2024-01-10 15:23:42 -05:00
snipe b94aaad9b5 Search on supplier name attached to maintenance 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-10 13:16:07 +00:00
akemidx 27103124bf messages/translations 2024-01-09 16:49:56 -05:00
Marcus Moore 423b636db9 Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe 8541a342cb Merge pull request #14108 from Godmartinz/asset_maintenance_scope 
Added supplier name as a searchable relation on the asset maintenance report
 2024-01-08 22:25:55 +00:00
Godfrey M 4184b271f7 adds Supplier as a searchable relation on the asset maintenance report 2024-01-08 14:22:35 -08:00
snipe 2707c399ea Check that the asset exists before trying to get properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-08 12:42:05 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
Marcus Moore 742e183b02 Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
Marcus Moore 740d46a50e Repopulate report after validation error 2024-01-02 17:59:30 -08:00
spencerrlongg 901b1b83d0 rm code, was probably fixed through rules at some point 2024-01-02 18:27:17 -06:00
Spencer Long 8546407083 Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 38bd530fae Update en defaults for controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:44:20 +00:00
snipe ed9473c8ff Update ResetSettings command to en-US vs en 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 18:32:21 +00:00
Marcus Moore fcef60445c Implement radioValue properly 2023-12-21 18:07:46 -08:00
Marcus Moore 9e0897b2cb Remove old comments 2023-12-21 17:40:26 -08:00
Marcus Moore 8c434c7862 Implement and scaffold tests 2023-12-21 17:02:44 -08:00
Marcus Moore 7f153b32e4 Always return an array from selectValues method 2023-12-21 16:38:51 -08:00
Marcus Moore 4fc8e8dd61 Add todo 2023-12-21 14:27:31 -08:00
Marcus Moore 4c62e8ade9 Add guard against attempting to access property on unsaved template 2023-12-21 13:11:44 -08:00
Marcus Moore 62f8353bd7 Implement model filtering for selectValue method 2023-12-21 13:03:43 -08:00
Marcus Moore 5c0c60a5b9 Formatting 2023-12-21 12:02:54 -08:00
Marcus Moore 6fcbb108c6 Implement test for filtering out invalid models from selectValues 2023-12-21 12:02:48 -08:00
Marcus Moore 71761a48ad A few more small clean ups 2023-12-20 17:50:55 -08:00
Marcus Moore 9a5c8c4ce6 Formatting and clean ups 2023-12-20 16:24:48 -08:00
Marcus Moore 0504c09a9a Implement ability to delete templates 2023-12-20 16:19:04 -08:00
Marcus Moore 0527201ae5 Allow templates to be updated 2023-12-20 14:41:23 -08:00
Marcus Moore 26cc4497eb Use dedicated show route for report templates 2023-12-20 14:01:46 -08:00
akemidx ebf760a477 translations, UI fixes 2023-12-19 18:01:19 -05:00
snipe 97ba023152 Moved return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:47:06 +00:00
snipe a5947b8109 Added warning in middleware 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:34:45 +00:00
snipe 4a0d4f5862 Moved static var up above 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:27:11 +00:00
snipe 1a0e1b5f6c Added default to helper per @marcusmoore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:23:11 +00:00
Brady Wetherington 12ed8800d1 Changed some spacing and added a comment as per Snipe 2023-12-19 20:06:48 +00:00
Brady Wetherington 82dd601661 Added back-migration for Big Locale Refactoring 2023-12-19 19:54:04 +00:00