3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Commit Graph

118 Commits

Author SHA1 Message Date
204140f34f Fixed #19398 - restore simple location layout for dropdowns 2026-07-29 18:33:59 +01:00
2359b2d149 Merge pull request #19236 from Sxderp/pr-remove-dup-query
Fixes #19235: use total var to avoid multiple database queries
2026-07-28 22:12:38 +01:00
62fde2ac3e Fixed #17565 -
The rtd_assets() relation on Location has no built-in status filter, so withCount('rtd_assets') counted archived assets and disagreed with the tab count. The other two (assets, assignedAssets) already had filters in place but I added the closure to all three for consistency and defense against future relation edits.
2026-07-28 09:10:14 +01:00
425a3767b6 Locations/Company: Always include parent in dropdown results 2026-07-22 22:52:29 +01:00
26bb338bda Merge pull request #19185 from grokability/dependent-dropdown-with-fmcs-scoping-for-location-parent
FMCS Location+Parent Scoping: Fixed FD-53555 - Adds company-scoped dropdown for parent location in GUI
2026-07-03 14:31:20 +01:00
5a37bc0c5d Fixes #19235: use total var to avoid multiple database queries
fixes ##19235

We were seeing multiple count queries (two or three) against
our database when using the API. With this change we are now
seeing one query and, for us, it saves on average 300ms.
2026-06-26 10:05:48 -04:00
029499b03e Updated the selectlist to use the indenter (similar to locations) 2026-06-25 17:00:00 +01:00
b91f7f9ca7 Locations: Small out of bound fix for php8.5 deprecation 2026-06-25 15:39:31 +01:00
cf7701e159 API Controllers: Fixed missing sorts on some columns
In the presenters, we had some fields labeled as sortable that were not actually sortable via the API ($allowed_columns). This shores that up
2026-06-17 12:20:56 +01:00
cc526d9b42 Adds company-scoped dropdown for parent location 2026-06-13 18:38:06 +01:00
8ebddd95ff FMCS+location scoping - Fixed scope boundaries 2026-06-12 16:46:23 +01:00
a27c551f64 Style changes requested 2026-06-12 16:10:17 +01:00
6a0ec69451 FMCS/Validation: Fixed #19166 - translate error messages on FMCS fail 2026-06-10 12:44:46 +01:00
9a8cbd6e00 API: Fixed FD-55735- API Location Creation Bypasses FMCS Parent-Child Company Boundary Validation 2026-06-08 16:52:05 +01:00
4145f64399 Exclude current id on checkin pages 2026-05-29 10:50:10 +01:00
0170fb7711 Added test for location scoping 2026-05-29 10:39:03 +01:00
42df2f6c31 One more fix for #19112 2026-05-29 09:37:23 +01:00
ec67195014 Removed a few duplicate queries 2026-05-29 01:34:11 +01:00
e7c80b89eb Scope assets, locations, etc to the target, not the admin 2026-05-20 19:10:51 +01:00
fe308ef2e4 Use query clone to prevent n+1 2026-04-14 10:25:37 +01:00
4c4ec3eacc Fixed #18821 - pagination on history 2026-04-04 16:59:23 +01:00
7ec60bc6f2 Same as #18808 but renamed assetstatus to status 2026-04-02 11:26:23 +01:00
0261776778 Added FilterRequest and added refactorerd search check 2026-03-27 19:19:25 +00:00
a500dd4e9e Add generic history method and component blade for loggables 2026-03-26 12:13:59 +00:00
1e5d426e70 Apply pint to API controllers 2026-03-13 16:38:23 +00:00
0f215bbcf8 fix: replace deprecated Symfony Request::get() usage 2025-12-17 18:44:04 -08:00
f2334082ee Added tag color to location query 2025-11-24 17:40:13 +00:00
b4f5260dda Updated controllers to use tag_color 2025-11-17 11:36:11 +00:00
590f77bdb4 Updated controllers and presenters 2025-11-14 17:58:27 +00:00
7a6fdc4e0a Added parent ID to location API
Signed-off-by: snipe <snipe@snipe.net>
2025-09-09 15:18:09 +01:00
2eb727bd0c Added tests
Signed-off-by: snipe <snipe@snipe.net>
2025-09-09 13:51:56 +01:00
57af507170 Added deleted button to locations, check for additional relations
Signed-off-by: snipe <snipe@snipe.net>
2025-09-09 12:20:34 +01:00
40c31a1ad7 Eager load adminuser method
Signed-off-by: snipe <snipe@snipe.net>
2025-05-29 17:13:16 +01:00
309d242c4d Update LocationsController.php - added company_id for API request 2025-05-28 15:45:22 +02:00
43c15ef134 Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
329fbf6a7c Scope results by location ID
Signed-off-by: snipe <snipe@snipe.net>
2025-02-18 19:01:16 +00:00
4ee5a4c5c3 Added notes to API controllers
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:31:50 +00:00
4e0bcac1a1 Furhter validation for scoped locations
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2025-01-24 11:12:11 +01:00
b6f05bff1f Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
021c4f2598 Added assets endpoint
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
ddd11939a5 No need to include assigned_to
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
a0b9714d72 Updated user_id to created_by
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:34:49 +00:00
1318dc6111 Add a backward compatibility setting for locations with companies
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
2024-11-04 10:03:38 +01:00
1ccbf8942c Add ability to tie locations to companies
Locations are the last big part of the application that can't be tied to companies.
This can be a problem with FullMultipleCompanySupport, because you can't restrict the visibility of locations to the company of the users.

In order to change this, add a company_id to the locations table and wire everything up in the views and controllers.
Aditionally add a new formatter to filter the locations to a specific company, like it is done for assets.

Locations are properly scoped to the users company if FullMultipleCompanySupport is enabled.
If a parent location of a location has a different company than the user, the location does not show up.
2024-11-04 10:03:37 +01:00
9350a20189 Include accessories count
This isn’t exactly right right now

Signed-off-by: snipe <snipe@snipe.net>
2024-08-07 20:19:47 +01:00
889d5da71e Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
2024-08-07 20:04:32 +01:00
c3a2cdeee9 Added assets endpoint for locations
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 20:53:58 +01:00
1d65781d8d More type-hinting
Signed-off-by: snipe <snipe@snipe.net>
2024-07-05 07:07:20 +01:00
877adb082c Fixed translation string
Signed-off-by: snipe <snipe@snipe.net>
2024-06-03 16:40:52 +01:00