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
c377b41198
Updated controllers
2026-05-20 14:58:18 +01:00
9bc92f57c8
Apply pint to non-API controllers
2026-03-13 16:45:30 +00:00
3c96491295
Remove unused route
2026-03-12 14:24:46 +00:00
590f77bdb4
Updated controllers and presenters
2025-11-14 17:58:27 +00:00
0004d4936c
Cleaned up print view
...
Signed-off-by: snipe <snipe@snipe.net >
2025-09-09 15:18:28 +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
f1dd84edba
Added option to clone original images
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-04 18:47:26 +01:00
41fb058adb
Added gates around printing location assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:06:44 +01:00
43c15ef134
Merge branch 'develop' into feature/locations_with_companies
2025-04-08 09:18:48 +01:00
6a8a41b389
fix: reference to item location on location edit method
2025-02-24 17:34:18 -05:00
f7d213052a
Route model binding for resource groups
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 02:49:05 +00:00
4e2b22135a
Added notes to UI controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:32:07 +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
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
1582d81e5b
Change user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 22:16:41 +01:00
229d8b9bf5
Added location restore
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:19:59 +01:00
a1eafc108d
Moar typehinting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 22:37:58 +01:00
ae9085b11f
Modernize use statements, switch to auth()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:49:22 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
090466123f
add withCount to query instead
2024-03-19 15:18:18 -07:00
38a3e36cd6
fixes translation usage
2024-03-19 14:32:21 -07:00
e8dc634a40
fixes translation usage
2024-03-19 14:30:53 -07:00
04891c7c61
Eager load relations to determine
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 22:25:00 +00:00
1797480128
Few more translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 17:27:56 +00:00
a76a69d085
Fixed incorrect string for location not existing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-13 20:23:32 +00:00
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 19:44:21 +01:00
b8231f420b
Remove name from blanking paroperties
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:12:33 -08:00
84a14918bb
Updated comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:03:33 -08:00
473553c464
Moved gate
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:01:40 -08:00
dac877f184
Added location clone
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 13:51:35 -08:00
dba06a3a9e
Check for valid location before trying to print
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-03 16:56:15 -07:00
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
c6726015f7
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2021-04-30 14:52:08 -07:00
315bcb6b38
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2021-04-23 14:26:57 -07:00
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
0329028e2c
Fixed #8926 , #8252 - introduce circular reference check for location parent_id - rebased from #8253 ( #8927 )
...
* Fixed #8252 - circular references in location parents
* Remove non-translated translation changes
* Fix typo
* Add loop limit to avoid unforseen infinite loops
* Remove check against parent_id in location controllers
* Remove the Location->id=null piece (no longer needed)
* Fix some formatting and whitespace
* Re-introduce accidentally merged-out language file
Co-authored-by: Travis Miller <milletr@tulsaschools.org >
2020-12-18 17:18:04 -08:00
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
2020-05-23 15:24:10 -04:00
c74b904f14
Fix Location parent different validation on new location creation.
2020-04-28 11:39:52 -04:00
b725e788ec
Applied new selectlist search to locations
...
Signed-off-by: snipe <snipe@snipe.net >
2020-04-22 06:39:41 -07:00
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
0b3f511534
Fixed compact() errors
2020-04-07 17:26:56 -07:00
a5b180a9c6
Fixed Call to a member function count() on null for location delete
2019-12-11 10:46:07 -08:00
e71e57f16a
Fixed XSS vulnerability in SVG image uploads [ch10476] ( #7639 )
...
* Added enshrined/svg-sanitize
* Added modular image resizing/SVG cleaning method
(This already exists in v5, so I mostly ported it forward and added the SVG sanitizer.)
* Use improved handleImages method to upload/resize/clean images
* Removed $old_image
This is handled in the ImageUpload request now
2019-12-05 22:23:05 -08:00
snipe