c14880dfca
Oh, pint
2026-06-12 16:10:29 +01:00
a27c551f64
Style changes requested
2026-06-12 16:10:17 +01:00
ab1a5c0241
FMCS: check for floater mode in user and company
2026-06-10 11:22:50 +01:00
b0aa21bee7
FMCS: throw an error if companies don’t match, updated tests
2026-06-09 19:08:27 +01:00
c44f3319e3
Fixed company quirk with multi-company users creating assets, etc
2026-06-09 18:50:49 +01:00
42df2f6c31
One more fix for #19112
2026-05-29 09:37:23 +01:00
6f1c49e14d
Fixed #19089 - show uploads in activity report for companies, models, etc
2026-05-28 10:14:30 +01:00
f92a9a6cc6
Made isFullMultipleCompanySupportEnabled a public method
2026-05-26 14:23:32 +01:00
3737b34913
Back-patch security fixes
2026-05-26 11:36:29 +01:00
4db4314f18
Added getCurrentUserCompanyIds (plural) to Company model
2026-05-19 13:26:06 +01:00
80b7ebd508
Moved adminuser method to the SnipeModel
2026-03-27 19:20:54 +00:00
614a2cd5de
Pint cleanup
2026-03-26 16:02:24 +00:00
616d0f00f9
Added #18767 - uploads for companies and departments
2026-03-26 16:02:07 +00:00
9623fa4d87
Use pint on models directory
2026-03-13 15:55:28 +00:00
27ece84d52
Adds withTrashed() to adminuser and updates presenter to show strikethrough
2026-02-23 10:49:44 +00:00
5e9e0b70db
Fixes #18377 - make min value for names consistent
2026-01-05 12:51:49 +00:00
ea7cffc1a3
Made tag_color fillable
2025-11-14 15:57:27 +00:00
7b5d90dd81
Moved model traits into proper directory
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-28 18:23:26 +01:00
95f867b267
Code formatting fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-09 21:48:53 +01:00
c1f1ae6b64
Removed logging
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-07 12:31:12 +01:00
c4fcc6c24e
Removed direct scoping calls
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-07 12:26:30 +01:00
e5e586dc43
Attempt to generalize companyable in company scope
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-02 17:12:55 +01:00
bbe748dbd3
Removed noisy log
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-23 19:05:39 +01:00
bc77c8c885
Add notes to $fillable
2025-03-27 10:57:34 -07:00
979e4502ff
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
2024-10-17 15:14:39 -07:00
b88f2054dd
Refactor isDeletable on companies
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 20:38:34 +01:00
6579fa72da
Added scoping for categories and companies
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:56:05 +01:00
1582d81e5b
Change user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 22:16:41 +01:00
ae9085b11f
Modernize use statements, switch to auth()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:49:22 +01:00
b156264684
Tidied up scoping to be better for testing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 23:10:53 +01:00
06e9625c64
Use hasUser() to avoid table collisions and infinite loop
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 06:58:07 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
45eda0f611
Removed debug lines
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:09:27 +01:00
d2e7e11dca
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-13 12:48:28 +01:00
424cbd3248
Removed noisy debug
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-18 14:25:54 +01:00
5e8c129c7f
Revert accidental commit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 09:26:50 +01:00
ab3b5ca4ef
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 09:26:07 +01:00
c604f08749
Small tweaks for troubleshooting :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 18:47:55 +01:00
989dab6259
Moved company scoping methods to group them together
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-10 14:35:13 +01:00
9e6e2de71e
Add docblock
2024-02-05 12:49:29 -08:00
bbb8ecfee4
Update Company.php
2023-08-13 17:21:55 +02:00
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 19:44:21 +01:00
94afe2bc6a
edits & typo fixes
2022-12-19 14:48:43 -05:00
133d6ffa50
Commenting on a scope in Models/Company.php
2022-12-15 15:18:24 -05:00
418ddcfac3
Merge pull request #9876 from Toreg87/fixes/locations-deletable
...
Fixed #9875 : Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
2022-12-14 17:46:53 -08:00
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
d1304cc975
Add sentence to infer the table's name according to the query passed
2021-08-30 13:44:26 -05:00
1a908e361e
Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
...
locations->isDeletable() checks via gate::allows if a locations is deletable.
This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item).
This returns false because locations don't have a company_id.
Check for this and return true if the item don't have a company_id.
2021-07-29 10:43:01 +02:00
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
snipe