Commit graph

4254 commits

Author SHA1 Message Date
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
Brady Wetherington
f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00: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
38bd530fae Update en defaults for controllers
Signed-off-by: snipe <snipe@snipe.net>
2023-12-24 19:44:20 +00: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
a5947b8109 Added warning in middleware
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 20:34:45 +00:00
snipe
db138479aa Updated locale middleware for mapping
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:43:22 +00:00
snipe
f9139e0f10 Changed to use instanceof
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 13:25:32 +00:00
snipe
f13c1a53ef Get an object instead of a collection
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 12:51:35 +00:00
snipe
f08ce34036 Fixed translation string in JSON
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 12:31:55 +00:00
akemidx
85bfbf8bc4 email in table, shows in export 2023-12-18 20:15:06 -05:00
akemidx
3fe3697a29 adding column, needs table join 2023-12-18 18:26:47 -05:00
snipe
e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577
Added Status Label names to Asset history/ Action log
2023-12-18 22:41:02 +00:00
Marcus Moore
9fcb1a2d0e
Rename SavedReport to ReportTemplate 2023-12-18 12:55:48 -08:00
snipe
444c41bedb Fixed #14037 - record current time on accessory checkin
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 16:39:18 +00:00
snipe
421802893e Added new fields to action report
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 10:45:22 +00:00
snipe
f5f136b9b5 Added fields to history views
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:31 +00:00
snipe
a90b04c905 Allowed sorting on user_agent, etc
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:08 +00:00
Marcus Moore
27bb938d9e
WIP: add dedicated edit report page 2023-12-13 18:09:42 -08:00
akemidx
ad202be374 update method (WIP ver) 2023-12-13 17:31:58 -05:00
snipe
016ca1adc1 Fixed HTML for checkboxes
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 06:27:50 +00:00
snipe
b53a4c366e Removed escaping on notes on checkout
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:26:41 +00:00
snipe
e894138fd4 Added $user->created_at to API user create method
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 12:26:02 +00:00
snipe
631dd58de1 Added model name and number to quickscan
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 04:23:04 +00:00
Marcus Moore
89c47c1879
Add validation for saving reports 2023-12-11 16:20:36 -08:00
Marcus Moore
b9cda88363
Alphabetize saved reports list 2023-12-11 16:20:17 -08:00
Marcus Moore
52028ddef2
Add authorization to saving saved reports route 2023-12-11 15:34:17 -08:00
Marcus Moore
c9157dc55d
Update docblock 2023-12-11 14:20:33 -08:00
Marcus Moore
c3b53b28e3
Allow saving custom reports 2023-12-11 14:19:03 -08:00
akemidx
e636d7b9d5 multiple saved reports, beginning of dynamic dropdown listing/queried url 2023-12-11 15:28:34 -05:00
snipe
778e45c9fd Fixed maintenances patch endpoint
Signed-off-by: snipe <snipe@snipe.net>
2023-12-07 19:36:12 +00:00
spencerrlongg
f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg
18720b3302 safety stuff 2023-12-05 20:36:59 -06:00
spencerrlongg
12e546e63a everything working, cleanup 2023-12-05 20:22:20 -06:00
spencerrlongg
c28936fefb almost there... problem with update button 2023-12-05 17:39:35 -06:00
spencerrlongg
080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
spencerrlongg
d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -06:00
Godfrey M
b90cfba796 adds status label id to line change 2023-12-05 11:56:54 -08:00