DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-06-10 03:41:03 -07:00
parent 4e1472f66d ec4bc6c2af
commit 02a9394cd9
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/AssetsController.php
View file

@ -695,9 +695,7 @@ class AssetsController extends Controller
$asset = Asset::find($assetId); $asset = Asset::find($assetId);
$size = Helper::barcodeDimensions($settings->barcode_type); $size = Helper::barcodeDimensions($settings->barcode_type);
if (!Company::isCurrentUserHasAccess($asset)) {
return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
}
if (isset($asset->id,$asset->asset_tag)) { if (isset($asset->id,$asset->asset_tag)) {
$barcode = new \Com\Tecnick\Barcode\Barcode(); $barcode = new \Com\Tecnick\Barcode\Barcode();
@ -724,9 +722,6 @@ class AssetsController extends Controller
$settings = Setting::getSettings(); $settings = Setting::getSettings();
$asset = Asset::find($assetId); $asset = Asset::find($assetId);
if (!Company::isCurrentUserHasAccess($asset)) {
return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
}
if (isset($asset->id,$asset->asset_tag)) { if (isset($asset->id,$asset->asset_tag)) {
$barcode = new \Com\Tecnick\Barcode\Barcode(); $barcode = new \Com\Tecnick\Barcode\Barcode();

1
app/Http/Controllers/SettingsController.php
View file

@ -338,6 +338,7 @@ class SettingsController extends Controller
$setting->locale = e(Input::get('locale', 'en')); $setting->locale = e(Input::get('locale', 'en'));
$setting->qr_code = e(Input::get('qr_code', '0')); $setting->qr_code = e(Input::get('qr_code', '0'));
$setting->full_multiple_companies_support = e(Input::get('full_multiple_companies_support', '0'));
$setting->alt_barcode = e(Input::get('alt_barcode')); $setting->alt_barcode = e(Input::get('alt_barcode'));
$setting->alt_barcode_enabled = e(Input::get('alt_barcode_enabled', '0')); $setting->alt_barcode_enabled = e(Input::get('alt_barcode_enabled', '0'));
$setting->barcode_type = e(Input::get('barcode_type')); $setting->barcode_type = e(Input::get('barcode_type'));

3
app/Models/Company.php
View file

@ -3,6 +3,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
use Auth;
/** /**
* Model for Companies. * Model for Companies.
@ -108,7 +109,7 @@ final class Company extends Model
public static function isCurrentUserAuthorized() public static function isCurrentUserAuthorized()
{ {
return (!static::isFullMultipleCompanySupportEnabled() || Auth::user()->company_id == null); return (!static::isFullMultipleCompanySupportEnabled() || (Auth::user()->company_id == null) || Auth::user()->isSuperUser());
} }
public static function canManageUsersCompanies() public static function canManageUsersCompanies()