diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php index fabccf190..1eb0b86f8 100755 --- a/app/Http/Controllers/GroupsController.php +++ b/app/Http/Controllers/GroupsController.php @@ -84,7 +84,7 @@ class GroupsController extends Controller * @since [v1.0] * @return \Illuminate\Contracts\View\View */ - public function edit($id = null) + public function edit($id) { $group = Group::find($id); @@ -95,7 +95,7 @@ class GroupsController extends Controller return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions')); } - return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id'))); + return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found')); } /** diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php index a26be9ac1..444783677 100755 --- a/app/Http/Controllers/LicensesController.php +++ b/app/Http/Controllers/LicensesController.php @@ -288,7 +288,7 @@ class LicensesController extends Controller } - $this->authorize('checkout', $licenseSeat); + $this->authorize('checkout', $license); // Declare the rules for the form validation $rules = [ diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php index e96a9ed84..5cf5c7c47 100644 --- a/app/Http/Transformers/LicensesTransformer.php +++ b/app/Http/Transformers/LicensesTransformer.php @@ -25,7 +25,7 @@ class LicensesTransformer 'name' => e($license->name), 'company' => ($license->company) ? ['id' => (int) $license->company->id,'name'=> e($license->company->name)] : null, 'manufacturer' => ($license->manufacturer) ? ['id' => (int) $license->manufacturer->id,'name'=> e($license->manufacturer->name)] : null, - 'product_key' => e($license->serial), + 'product_key' => (Gate::allows('viewKeys', License::class)) ? e($license->serial) : '------------', 'order_number' => e($license->order_number), 'purchase_order' => e($license->purchase_order), 'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'), diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 230f4c7db..fe3589817 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1000,7 +1000,7 @@ class Asset extends Depreciable } if (($fieldname!='category') && ($fieldname!='location') - && ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='manufacturer')) { + && ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) { $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%'); } diff --git a/config/permissions.php b/config/permissions.php index 6e578ae9d..0337916c1 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -17,14 +17,7 @@ return array( 'label' => '', 'note' => 'Determines whether the user has access to most aspects of the admin. ', 'display' => true, - ), - - array( - 'permission' => 'admin.api_key', - 'label' => 'Create API Key', - 'note' => 'Determines whether the user can access the API via API key.', - 'display' => false, - ), + ) ), 'Reports' => array( diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 65c570c75..28fa23dc2 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -101,9 +101,9 @@ View Assets for {{ $user->present()->fullName() }} {{ $license->name }} @can('viewKeys', $license) - {{ mb_strimwidth($license->serial, 0, 50, "...") }} + {{ mb_strimwidth($license->serial, 0, 50, "...") }} @else - --- + ------------ @endcan diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 0d94a7703..ef455e493 100755 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -6,60 +6,177 @@ ]) @section('content') - + + + @parent @stop @section('inputFields')
- +
{!! $errors->first('name', ' :message') !!}
+
+ + + + + + + + + + @foreach ($permissions as $area => $area_permission) + + + @if (count($area_permission) == 1) - @foreach ($permissions as $area => $permission) - @for ($i = 0; $i < count($permission); $i++) + + + + + + @else - - @if ($permission[$i]['display']) -
-

{{ $area }}: {{ $permission[$i]['label'] }}

-

{{ $permission[$i]['note'] }}

+
+ + + + - -
- + @foreach ($area_permission as $index => $this_permission) + @if ($this_permission['display']) + + + + + + + @endif + @endforeach + + + @endif - @endfor - @endforeach + @endforeach + +
PermissionGrantDeny
+

{{ $area . ': ' . $localPermission['label'] }}

+ 		+ {{ Form::radio('permission['.$localPermission['permission'].']', '1',$groupPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal']) }} + + {{ Form::radio('permission['.$localPermission['permission'].']', '0',$groupPermissions[$localPermission['permission'] ] == '0',['value'=>"grant", 'class'=>'minimal']) }} +
+

{{ $area . ': ' . $localPermission['label'] }}

+

{{ $localPermission['note'] }}

- -
- - +
+ {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} + + {{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} +
+ {{ $this_permission['label'] }} + + {{ Form::radio('permission['.$this_permission['permission'].']', '1',$groupPermissions[$this_permission['permission'] ] == '1',['class'=>'minimal radiochecker-'.str_slug($area)]) }} + + {{ Form::radio('permission['.$this_permission['permission'].']', '0',$groupPermissions[$this_permission['permission'] ] == '0',['class'=>'minimal radiochecker-'.str_slug($area)]) }} +
+
+@stop +@section('moar_scripts') + + @stop diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index 140307a9a..ba29db4a6 100755 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -7,8 +7,8 @@ @stop @section('header_right') - {{ trans('general.create') }} -{{ trans('general.back') }} + {{ trans('general.create') }} +{{ trans('general.back') }} @stop diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php index a4ce704c0..3c637b4f3 100644 --- a/resources/views/groups/view.blade.php +++ b/resources/views/groups/view.blade.php @@ -7,7 +7,7 @@ @stop @section('header_right') - {{ trans('admin/groups/titles.update') }} + {{ trans('admin/groups/titles.update') }} {{ trans('general.back') }} @stop diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 69c048951..c922efb2d 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -86,7 +86,7 @@ 'company_id'=>e(Input::get('company_id')), 'status_id'=>e(Input::get('status_id'))))}}" data-click-to-select="true" - data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.app_version') }}"> + data-cookie-id-table="{{ e(Input::get('status')) }}assetTable"> diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index d21c73b45..2b8d3391a 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -156,16 +156,21 @@ @endif - @can('viewKeys', $license) + @if (!is_null($license->serial)) {{ trans('admin/licenses/form.license_key') }} - {!! nl2br(e($license->serial)) !!} + @can('viewKeys', $license) + {!! nl2br(e($license->serial)) !!} + @else + ------------ + @endcan + @endif - @endcan + @if (!is_null($license->license_name)) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index bbf4b6e34..e84d5c175 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -456,16 +456,16 @@ - - - - + + + + + @foreach ($permissions as $area => $permissionsArray) @if (count($permissionsArray) == 1) - - + @else - + @@ -527,31 +527,32 @@ @endif @endforeach - + @endif @endforeach +
PermissionGrantDenyInheritPermissionGrantDenyInherit

{{ $area }}

 - {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal']) }} + {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} - {{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal']) }} + {{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area)]) }} - {{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal'] ) }} + {{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal', 'data-checker-group' => str_slug($area)] ) }}
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }} @else - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'minimal radiochecker-'.str_slug($area)]) }} @endif @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }} @else - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'minimal radiochecker-'.str_slug($area)]) }} @endif @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'minimal radiochecker-'.str_slug($area)]) }} @else - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'minimal']) }} + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'minimal radiochecker-'.str_slug($area)]) }} @endif
@@ -565,6 +566,8 @@ @stop @section('moar_scripts') + + - - - - - + + @stop