Godfrey M
15cc4345ab
adds dynamic redirects to Assets
2024-05-14 13:25:52 -07:00
Godfrey Martinez
5272824d85
Merge branch 'develop' into asset-location-update-bug
2024-05-13 10:47:25 -07:00
snipe
9bce0f2ff7
Format fix
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-13 18:19:14 +01:00
Jeremy Price
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
snipe
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
Tobias Regnery
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
spencerrlongg
ad2ba252ee
two new test
2024-05-07 15:11:33 -05:00
spencerrlongg
17ef20ea92
alright, in a working place
2024-05-07 14:08:47 -05:00
snipe
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 19:16:56 +01:00
snipe
97bc4a092f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:40:48 +01:00
snipe
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:40:35 +01:00
snipe
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 15:54:43 +01:00
snipe
482965197d
Added users, locations to presenter, transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:41 +01:00
snipe
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:28 +01:00
snipe
4f12c86e74
Fixes #14692 - set default variables for sidebar totals
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 08:34:22 +01:00
Brady Wetherington
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
Godfrey M
c94a7613ca
dropdown redirect options, helper function and session variable added
2024-05-02 12:16:20 -07:00
snipe
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
snipe
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-02 12:36:57 +01:00
spencerrlongg
e177993bcc
notes and some playing around, push for eod
2024-05-01 16:57:11 -05:00
spencerrlongg
25480293dc
change keys to values, add test
2024-04-30 18:03:26 -05:00
snipe
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
snipe
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 21:01:43 +01:00
snipe
860764a436
Use totals for sidebar
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 19:12:21 +01:00
snipe
3f04afee5c
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 19:01:26 +01:00
snipe
2117f61e8c
More view sharing for sidebar
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 19:01:15 +01:00
snipe
6dc9ccffcd
Refactor api for handling audit/expected checkins
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 18:56:57 +01:00
snipe
bf058bd5c6
Use updated scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 14:02:56 +01:00
snipe
dfaf01e8aa
Updated asset counters
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 14:02:47 +01:00
Marcus Moore
2a71877bec
Add additional condition
2024-04-25 17:04:07 -07:00
Marcus Moore
30bd920497
Add conditional
2024-04-25 16:24:12 -07:00
Marcus Moore
1d5b48b88d
Add comment and improve method
2024-04-25 16:22:15 -07:00
Marcus Moore
3a2eeaea7a
WIP: Future-proof rules being converted to array syntax
2024-04-24 17:40:40 -07:00
Marcus Moore
12418ae91b
WIP: allow EU style purchase cost via api
2024-04-24 17:18:29 -07:00
Brady Wetherington
3f5c5cbe82
Merge branch 'develop' into snipeit_v7_laravel10
2024-04-24 16:24:43 +01:00
snipe
2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button
...
Added a License Export function and button
2024-04-24 04:42:56 +01:00
akemidx
ac4aa97103
develop reheading
2024-04-23 17:05:50 -04:00
akemidx
0bc93c6a1e
space
2024-04-23 15:31:37 -04:00
snipe
685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels
...
Removed encrypted fields from label options
2024-04-23 13:31:38 +01:00
snipe
bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields
...
Re-enabled updating encrypted custom fields via API [sc-41465]
2024-04-23 10:20:55 +01:00
Godfrey M
96b3af7cbc
fixed view from sending all custom fields
2024-04-22 18:27:34 -07:00
Godfrey M
5fc6771543
adds licenses available, updated teranslations
2024-04-22 17:58:49 -07:00
akemidx
0d049a0be7
conflict resolution
2024-04-22 20:09:40 -04:00
akemidx
01c24ab4cd
translating text
2024-04-22 19:16:14 -04:00
Godfrey M
14ddf36d46
removed two duplicate translations
2024-04-22 10:43:11 -07:00
Godfrey M
25f1167c9d
adds company scoping to license export
2024-04-22 10:38:55 -07:00
snipe
2aa3ce15bd
Removed escaping on notes for file uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-22 14:55:02 +01:00
snipe
8dd71f99cc
Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-22 13:54:19 +01:00
akemidx
e8d9701a26
array key existing
2024-04-17 19:16:25 -04:00
snipe
4450351b75
Only sync groups if API user is superadmin
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-17 11:06:50 +01:00
