lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17914 commits 1 branch 0 tags 220 MiB
Commit graph

68 commits

Author SHA1 Message Date
snipe
66b537bc64 Fixed duplicate ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-28 09:59:28 +01:00
snipe
0822aa985d Fixed #16802 - use asset endpoint for assets assigned to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-24 14:05:44 +01:00
snipe
beb5560dce Added files tab 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-21 14:43:04 +01:00
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
snipe
90329a2b2f
Merge pull request #16529 from Godmartinz/location_tab_active-n-scroll_bar_fix 
Fix active table tab and double scroll bar under locations
 2025-04-08 07:12:33 +01:00
snipe
c46a9a773d Fixed admin string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 05:08:08 +01:00
snipe
f12d173581 Fixed #16618 - added notes to location sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 13:23:33 +01:00
Godfrey M
29cbf43d68 remove duplicate table class div 2025-03-18 11:48:09 -07:00
snipe
f42fcd25b1 Make the assets tab active by default on locations page 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-06 12:05:36 +00:00
snipe
0cd0abe8bb Fixed #16282 - adds accessories tab to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:20:21 +00:00
snipe
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
snipe
9b04d2e51c Updated route in view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe
5226d507d4 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe
27fab0f573 Use history icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:51 +00:00
snipe
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
Tobias Regnery
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
snipe
08c3a25b39 Little more padding 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:16:57 +01:00
snipe
34cd4b6244 Added links to apple/google maps 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:15:36 +01:00
snipe
d89c8682be Reversed location button ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:46:31 +01:00
snipe
479b2b4fd3 More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:23:08 +01:00
snipe
229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
snipe
0bc995b87f Updated more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:05 +01:00
snipe
0c09f2b2c0 Moar icon replacement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:13:49 +01:00
snipe
4c967a43a7 Removed loading of assets for label count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:56:51 +00:00
Nathan Butler
79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
snipe
e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe
4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
snipe
2543fa6b98 Fixed user icon for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:04:42 -07:00
snipe
7c34652da0 Fixed incorrect icons for mobile view on location tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:02:27 -07:00
snipe
d45d322b54 Use scoped query for asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 13:43:23 -07:00
snipe
a111482217 Use number_format on badges 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 14:59:06 -07:00
snipe
9072f7c6c9 Added click-to-select to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:49:50 -07:00
snipe
b26a4ad333 Added missing headers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:35:57 -07:00
snipe
1ea667e709 Update views with additional data fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:56 -07:00
snipe
9f478b51e2 Additional JS tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 20:13:51 -07:00
snipe
7c77e03c5a Initial rework of locations display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 18:08:15 -07:00
snipe
985e683896 Small display improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 16:59:53 -07:00
snipe
418a797e7e Use partial for asset bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:20:29 -07:00
Peter Sarossy
cacb707a7f
Added #9355: include Accessories and Consumables on the location reports (#9356) 2021-04-20 14:53:04 -07:00
Masudul Haque Shihab
f3831fe010
Fixed #9447 change route parameter name in locations view (#9456) 2021-04-20 14:49:05 -07:00
snipe
b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php
 2021-04-05 20:55:49 -07:00
snipe
2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
snipe
ede20523f2 Fixed #8680 - location image path 2020-11-09 21:08:19 -08:00
Blodinger
471e0fd2fc Changes the Google Maps window to be a bit more detailed 2020-09-22 14:30:38 -05:00
snipe
c6c75cc11f Fixed missing </h3 tags 2020-03-31 23:36:56 -07:00
snipe
bde45cbb34 Fixed h3 to h2 for semantic header levels 2020-03-31 21:30:24 -07:00
ajsy
c974968821 Update view.blade.php 2019-04-19 14:03:09 +03:00
ajsy
f2242fa32e Update view.blade.php 2019-04-19 13:20:41 +03:00
ajsy
a958d56590 Update view.blade.php 2019-03-09 11:29:06 +03:00
snipe
d9fa2f0e91 Fixed #5842 - added components to location detail view 2018-07-16 21:50:14 -07:00