fe44846c1b
Fix: only super users can change multiple companies support option
2015-11-19 09:17:50 +03:00
dbdc2c8e64
Fix some typos (e.g: companayable)
2015-11-19 08:48:43 +03:00
e66e2e42d3
Use global scope for companyable children
2015-11-19 08:42:17 +03:00
177fadba8a
Add better scoping for companayable children
2015-11-19 07:41:32 +03:00
d2423b2fc8
Show company name for the remaining entities
2015-11-18 19:15:56 +03: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
0a97c626e7
Fix $inout used when undefined
2015-11-18 07:16:53 +03:00
6478425be6
Fix dashboard shows all companies
...
Fix dashboard page shows statistics of all companies
even when the user is assigned to a company
and full multiple companies support is enabled
2015-11-18 06:14:08 +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
d8df61bd32
Merge remote-tracking branch 'upstream/develop' into multiple-companies
...
Conflicts:
app/controllers/admin/UsersController.php
app/views/backend/hardware/index.blade.php
2015-11-12 09:30:11 +03:00
2afc252549
Link to category listing from accessories
2015-11-11 17:43:24 -08:00
aa05d041bd
Fixes #1324 - missing $inout variable when if/else not met
2015-11-11 17:22:28 -08:00
1a4926ce13
Sort by asset image for PR #1330
2015-11-11 15:57:41 -08:00
ab3871f678
Small changes for PR #1330
2015-11-11 15:56:01 -08:00
7297a6031e
Merge pull request #1330 from mtucker6784/develop
...
Images for devices on the Assets datatable page.
2015-11-11 15:51:31 -08:00
b9c36f8638
Fixes #1335 - editing maintenance
2015-11-10 18:02:06 -08:00
90009db1b5
Image is now recorded upon initial asset creation.
2015-11-09 12:01:31 -07:00
d7f8d0fc04
Changed image save location in AssetsController
2015-11-09 09:35:10 -07:00
d1a306cfd8
Yay, asset image progress!
2015-11-09 08:25:29 -07:00
306d8ebaf7
Fixes #1317 - regression issue in bulk delete
2015-11-07 15:40:25 -08: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
11c2fcd094
Remove new window target
2015-11-04 16:10:27 -07:00
b856e7f2c6
Make Model column a hyperlink to access the model page.
2015-11-04 15:55:41 -07:00
feb74806a8
Removed models override
2015-11-04 01:08:17 -08:00
bc8c8e4225
Fixes #1012 - more consistency in manufacturer view
2015-11-04 00:48:53 -08:00
dc64ad55ee
Fixed link to manufacturers view
2015-11-04 00:37:43 -08:00
7e2b4183f6
Added in/out to categories
2015-11-04 00:37:27 -08:00
0a843fa856
OMFG really?
2015-11-04 00:18:22 -08:00
5a687f280f
One more currency tweak
2015-11-04 00:15:35 -08:00
4b2e7b9b06
Fixes #1013 - show location name on asset view page
2015-11-04 00:13:48 -08:00
1ac41a72ec
Link to asset in asset maintenance screen
2015-11-04 00:07:00 -08:00
6e117efebd
Fixed dumb indenting
2015-11-03 23:58:12 -08:00
130b1b4f4a
Converted category asset listing to bootstrap tables for #1266
2015-11-03 23:57:31 -08:00
2a43491792
Fixes #1291 on the asset view as well
2015-11-03 22:19:58 -08:00
f4331f4498
Fixes #1291 - use location currency and fall back to defaul currency for asset maintenances
2015-11-03 22:04:57 -08:00
0b0b55619b
Fixes #1291 - Use current currency, or sane fallback
2015-11-02 20:06:06 -08:00
a760a7575a
Added user notes back in
2015-11-02 19:28:51 -08:00
0745ec1502
Fixed scope for users
2015-11-02 19:26:10 -08:00
9731727095
Sorting for #1266
2015-11-02 19:17:20 -08:00
67a113cbf4
Additional fields for location assets display
2015-11-02 17:41:58 -08:00
e07dcf2598
Added location detail view
2015-11-02 16:45:19 -08:00
5c820d49a6
Fixes #1305
2015-11-02 16:44:17 -08:00
76968f7d48
Fixes asset model table sorting
2015-10-28 03:23:55 -07:00
09bcb137c4
Ugly fix for preventing errors if there is an invalid model (therefore no category)
2015-10-23 21:22:42 -07:00
8ec6b7e03a
Basic location ordering for #1266
2015-10-23 21:19:22 -07:00
efddda8665
Fixed expected_checkin error on asset view
2015-10-23 18:28:06 -07:00
eb1335405b
Order by last_checkout and expected_checkin for #1266
2015-10-23 17:59:21 -07:00
2953b395f2
Added order number to allowed sort columns
2015-10-23 15:12:06 -07:00
60f403f555
Expected checkin is a date, not a datetime
2015-10-23 14:29:00 -07:00
Abdullah Alansari