dad1ffb355
Specify table name in select to prevent id overwriting
2015-11-25 02:38:13 -08:00
d34e7178b3
Order consumable assignments by most recent
2015-11-24 22:18:28 -08:00
0428d21c5e
Order consumable assignments by most recent
2015-11-24 22:18:16 -08:00
d8b43215b0
Fix for missing admin ID
2015-11-24 22:00:29 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
67e968b032
Fixed attach() timestamps
2015-11-24 21:52:29 -08:00
e910b532c7
Account for invalid categories
2015-11-24 13:31:54 -08:00
a777499c0b
Fixes #1376 - added new fields to consumables view
2015-11-24 13:30:05 -08:00
08781a561b
Fix: use global scope for companies support
...
Use Eloquent ORM global scope instead of using
Company::scopeCompanayables() all over the place.
In addition, this makes it harder to for a user
that is assigned to a company to access unauthorized
assets through other entities (e.g: license seats)
2015-11-18 16:49:34 +03:00
b202e01205
Add full multiple companies support
...
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
2015-11-16 06:03:27 +03:00
23d10a8f7f
Make company field optional
...
Company field is now optional for the user,
although still required in the controllers.
2015-11-13 09:19:18 +03:00
6bf2a2875f
Add initial support for multiple companies
...
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0
https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03:00
f06af97364
Account for no limit or offset passed
2015-10-21 23:23:22 -07:00
5ff75e7f42
Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop
...
# Conflicts:
# app/controllers/admin/CategoriesController.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/categories/index.blade.php
# app/views/backend/settings/edit.blade.php
2015-10-21 23:06:43 -07:00
69c95f1f73
Merge pull request #1225 from ddreier/1088-acc-prices
...
Accessory and Consumable Price info #1088
2015-10-21 22:44:14 -07:00
0c830fa564
Added hidden ID column
2015-10-21 19:08:30 -07:00
b492ac4950
Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
...
# Conflicts:
# .gitignore
# app/controllers/admin/AccessoriesController.php
# app/controllers/admin/AssetsController.php
# app/controllers/admin/LicensesController.php
# app/models/Accessory.php
# app/models/Asset.php
# app/routes.php
# app/views/backend/accessories/index.blade.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/hardware/index.blade.php
# app/views/backend/licenses/index.blade.php
2015-10-20 17:52:02 -07:00
73d4c65daf
Finished work on #1088 . Added info to view, translation strings and logic to controllers.
2015-10-06 19:29:44 -05:00
4f74ad077a
Fixes #1136 - allow consumables to be deleted, even if they have been assigned
2015-10-06 16:08:32 -07:00
899e543173
Switch to new method
2015-08-18 16:12:23 +09:30
d62d6ebf05
Add extra fields for email
2015-07-24 09:28:17 +09:30
5ff84d80b4
Change user list from email to username
2015-07-20 10:16:58 +09:30
0fbccef759
Change user list to include email address
2015-07-16 10:23:28 +09:30
fd7d4eb3f2
Removed checkin for consumables
2015-06-22 17:57:44 -07:00
e4517a8782
Removed checkin for #782 , since that doesn't exist in consumables
2015-06-09 19:58:22 -07:00
19604480bb
Consumables section
...
TODO:
- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
snipe