54b24434e1
Set file name variable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 19:56:58 +01:00
81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
2024-05-16 16:13:21 +01:00
6b3346d90c
Only attempt to decrypt if there is a value
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:28:25 +01:00
312ce51de6
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:25:57 +01:00
09914f508f
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:16:52 +01:00
de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
...
Adds a note text area to asset acceptances/declines
2024-05-16 15:06:05 +01:00
fb9a5f928f
removed license changes
2024-05-15 16:39:26 -07:00
55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug
...
Fixed user assets not updating when a user changes location
2024-05-15 19:20:14 +01:00
c137fafa97
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 18:10:43 +01:00
cb22a3d556
Updated comments again :-/
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:52:50 +01:00
c7accb4599
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:38:42 +01:00
c1d5b8713b
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
8310b91e00
Use UploadFileRequest for audit files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
e5653eaa93
Save new data
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
3c4098038d
Fail early if no tag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912
...
Bulk Edit Tests and Tweaks
2024-05-15 11:22:31 +01:00
dc418a7033
need to make variables names uniform
2024-05-14 14:09:54 -07:00
15cc4345ab
adds dynamic redirects to Assets
2024-05-14 13:25:52 -07:00
5272824d85
Merge branch 'develop' into asset-location-update-bug
2024-05-13 10:47:25 -07:00
9bce0f2ff7
Format fix
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-13 18:19:14 +01:00
2adc4ffa96
Fix memory-hog query in AssetCountForSidebar middleware
...
https://github.com/snipe/snipe-it/pull/14702/files introduced a bug
where instead of doing a quick `select count(*)` of assets, it did a `select *` of
assets, moving the count from the database to the PHP process.
This caused OOM issues in memory-constrained environments with lots of
assets, and also presented a speed issue even when memory limited were
increased.
Additionally, given this populates the sidebar, this was likely an issue
on every page load that included the sidebar.
The fix is simply removing the `all()->`, ending up with Asset::count(),
which yields the desired `select count(*)` DB query.
2024-05-10 12:54:40 -07:00
46779ca865
Merge pull request #14697 from snipe/bug/sc-25502/disable_delete_if_not_deletable_user
...
Fixed UI where delete button was not disabled even if the user couldn't be deleted
2024-05-08 12:06:33 +01:00
b2a5d86e30
Fixes #14701 - wrong total asset count
...
The total asset count in the sidenav shows the ready to deploy count instead of the total count.
Fix this by adjusting the query to all assets. Also respect the setting for archived assets.
Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process.
While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2024-05-08 09:34:35 +02:00
ad2ba252ee
two new test
2024-05-07 15:11:33 -05:00
17ef20ea92
alright, in a working place
2024-05-07 14:08:47 -05:00
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 19:16:56 +01:00
97bc4a092f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:40:48 +01:00
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:40:35 +01:00
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 15:54:43 +01:00
482965197d
Added users, locations to presenter, transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07:41 +01:00
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07:28 +01:00
4f12c86e74
Fixes #14692 - set default variables for sidebar totals
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 08:34:22 +01:00
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
c94a7613ca
dropdown redirect options, helper function and session variable added
2024-05-02 12:16:20 -07:00
4850227c04
Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints
...
Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI
2024-05-02 13:11:51 +01:00
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:36:57 +01:00
e177993bcc
notes and some playing around, push for eod
2024-05-01 16:57:11 -05:00
25480293dc
change keys to values, add test
2024-04-30 18:03:26 -05:00
19cff25300
Merge pull request #14651 from marcusmoore/bug/sc-25402
...
Fixed `purchase_cost` not being allowed to be a string when creating asset via api
2024-04-27 03:39:10 +01:00
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:01:43 +01:00
860764a436
Use totals for sidebar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:12:21 +01:00
3f04afee5c
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:26 +01:00
2117f61e8c
More view sharing for sidebar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:15 +01:00
6dc9ccffcd
Refactor api for handling audit/expected checkins
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:56:57 +01:00
bf058bd5c6
Use updated scopes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:56 +01:00
dfaf01e8aa
Updated asset counters
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:47 +01:00
2a71877bec
Add additional condition
2024-04-25 17:04:07 -07:00
30bd920497
Add conditional
2024-04-25 16:24:12 -07:00
1d5b48b88d
Add comment and improve method
2024-04-25 16:22:15 -07:00
3a2eeaea7a
WIP: Future-proof rules being converted to array syntax
2024-04-24 17:40:40 -07:00
snipe