61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
9ec132acde
Small fixed for LDAP in settings table
2015-11-23 14:33:00 -08:00
840e5b1523
Revert "begin work on idap import button"
...
This reverts commit 3942fd1869
2015-11-22 11:10:36 -05:00
1ee3f29d2e
Revert "working on ldap import button"
...
This reverts commit 113dfc9c24
2015-11-22 11:02:19 -05:00
5445a7d16b
Scope users like other companyables
...
Note that the User model doesn't use global scope,
global models can have unexpected results that
would very likely break many parts of the application
2015-11-21 11:23:42 +03:00
86a174201e
Only users with no company or supers can manage users' companies
2015-11-21 04:30:15 +03:00
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
638a7773bd
syntax error
2015-11-18 16:36:02 -05:00
113dfc9c24
working on ldap import button
...
add route for button
added button and open/close for form
2015-11-18 16:22:04 -05:00
3942fd1869
begin work on idap import button
2015-11-18 12:11:42 -05: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
6f338e573c
set required_if ldap_enabled box has been checked.
2015-11-17 16:00:52 -05:00
8e44421788
added Crypt class and set ldap_pword field to longText
2015-11-17 15:20:55 -05:00
e031239cf0
Removed escaping, add sometimes required, add encrypt ldap password
2015-11-17 13:49:59 -05:00
c8ecddba54
Revert "Set required fields if ldap is enabled"
...
This reverts commit 2f69be03d3
2015-11-17 10:47:59 -05:00
2f69be03d3
Set required fields if ldap is enabled
2015-11-17 10:46:29 -05:00
63cd0c1ae1
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
2015-11-17 10:11:38 -05:00
8793a04869
add ldap integration to settings page.
2015-11-17 09:59:20 -05:00
2ec5f340e8
update validators and lang
2015-11-16 13:08:51 -05:00
50ea6c66f9
LDAP Settings update
...
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
2015-11-16 11:30:51 -05:00
30e8555148
updating users controller to work with database fields
2015-11-15 22:48:56 -05: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
d9cd4a4da0
setting up views for ldap
2015-11-11 23:03:46 -05: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
ecae451ebf
form validation
2015-11-09 22:34:18 -05:00
9627f15412
update settings controller to add ldap field validation
2015-11-09 22:32:00 -05:00
464f11c398
setting up bones for ldap settings
...
add migration
add ldap settings to settings controller
add ldap fields edit settings views
2015-11-09 22:09:09 -05: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
snipe