diff --git a/app/Http/Controllers/Users/RolesController.php b/app/Http/Controllers/Users/RolesController.php
index 56ba7fa..e14847d 100755
--- a/app/Http/Controllers/Users/RolesController.php
+++ b/app/Http/Controllers/Users/RolesController.php
@@ -2,7 +2,6 @@
namespace App\Http\Controllers\Users;
-use App\Entities\Users\Permission;
use App\Entities\Users\Role;
use App\Http\Controllers\Controller;
use App\Http\Requests\Users\Roles\CreateRequest;
@@ -17,9 +16,6 @@ class RolesController extends Controller {
// $role = null;
if ($req->has('act') && in_array($req->get('act'), ['show','edit','del'])) {
$role = $this->requireById($req->get('id'));
- if ($req->get('act') == 'show') {
- $permissions = $this->getAllPermissions();
- }
}
$roles = Role::whereType(0)->get();
@@ -75,11 +71,4 @@ class RolesController extends Controller {
{
return Role::findOrFail($roleId);
}
-
- private function getAllPermissions()
- {
- return Permission::whereType(1)->get();
- }
-
-
}
diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
index fada801..455dc97 100755
--- a/resources/views/layouts/partials/sidebar.blade.php
+++ b/resources/views/layouts/partials/sidebar.blade.php
@@ -68,7 +68,6 @@
{{ trans('user.users') }}
@can('manage_role_permissions')
{{ trans('role.roles') }}
- {{ trans('permission.permissions') }}
@endcan
diff --git a/resources/views/users/permissions.blade.php b/resources/views/users/permissions.blade.php
deleted file mode 100755
index 4f94828..0000000
--- a/resources/views/users/permissions.blade.php
+++ /dev/null
@@ -1,122 +0,0 @@
-@extends('layouts.app')
-
-@section('title', trans('user.permissions'))
-
-@section('content')
-
-
-
-
- @if (Request::get('act') == 'add')
-
-
{{ trans('permission.create') }}
-
- {!! Form::open(['route'=>'permissions.store']) !!}
- {!! FormField::text('name') !!}
- {!! FormField::text('label') !!}
- {!! Form::submit(trans('permission.create'), ['class' => 'btn btn-success']) !!}
- {!! link_to_route('permissions.index', trans('app.cancel'), [], ['class'=>'btn btn-default pull-right']) !!}
- {!! Form::close() !!}
-
-
- @elseif (Request::get('act') == 'edit' && !is_null($permission))
-
-
{{ trans('permission.edit') }}
-
- {!! Form::model($permission, ['route'=>['permissions.update', $permission->id],'method'=>'patch']) !!}
- {!! FormField::text('name') !!}
- {!! FormField::text('label') !!}
- {!! Form::submit(trans('permission.update'), ['class' => 'btn btn-warning']) !!}
- {!! link_to_route('permissions.index', trans('app.cancel'), [], ['class'=>'btn btn-default pull-right']) !!}
- {!! Form::close() !!}
-
-
- @elseif (Request::get('act') == 'del' && !is_null($permission))
-
-
{{ trans('permission.delete') }}
-
- {{ trans('app.delete_confirm') }}
-
-
-
- | {{ trans('app.name') }} | {{ $permission->name }} |
- | {{ trans('app.label') }} | {{ $permission->label }} |
- | {{ trans('permission.roles_count') }} | {{ $permission->roles()->count() }} |
-
-
-
-
- @elseif (Request::get('act') == 'show' && !is_null($permission))
-
-
{{ trans('permission.show') }}
-
-
- | {{ trans('app.name') }} | {{ $permission->name }} |
- | {{ trans('app.label') }} | {{ $permission->label }} |
- | {{ trans('permission.roles_count') }} | {{ $permission->roles()->count() }} |
-
-
-
-
-
-
{{ trans('role.roles') }}
-
-
- @foreach($permission->roles as $role)
-
- | {{ $role->name }} |
- {{ $role->label }} |
-
- @endforeach
-
-
-
- @endif
-
-
-
-
-
- | {{ trans('app.table_no') }} |
- {{ trans('app.name') }} |
- {{ trans('app.label') }} |
- {{ trans('permission.roles_count') }} |
- {{ trans('app.action') }} |
-
-
- @forelse($permissions as $key => $permission)
-
- | {{ $key + 1 }} |
- {{ $permission->name }} |
- {{ $permission->label }} |
- {{ $permission->roles_count }} |
-
- {!! link_to_route('permissions.index','detail',['act' => 'show', 'id' => $permission->id],['class'=>'btn btn-info btn-xs']) !!}
- {!! link_to_route('permissions.index','edit',['act' => 'edit', 'id' => $permission->id],['class'=>'btn btn-warning btn-xs']) !!}
- {!! link_to_route('permissions.index','x',['act' => 'del', 'id' => $permission->id],['class'=>'btn btn-danger btn-xs']) !!}
- |
-
- @empty
-
- | {{ trans('permission.not_found') }} |
-
- @endforelse
-
-
-
-
-
-@endsection
diff --git a/resources/views/users/roles.blade.php b/resources/views/users/roles.blade.php
index bfee291..0c961ab 100755
--- a/resources/views/users/roles.blade.php
+++ b/resources/views/users/roles.blade.php
@@ -71,17 +71,6 @@
{!! link_to_route('roles.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) !!}
- {!! Form::open(['route'=>['roles.update-permissions', $role->id]]) !!}
-
-
{{ trans('permission.permissions') }}
-
- {!! FormField::checkboxes('permission', $permissions->pluck('label','id')->all(), ['value' => $role->permissions,'label'=>false,'list_style' => 'unstyled']) !!}
-
-
-
- {!! Form::close() !!}
@endif
@@ -90,6 +79,7 @@
| {{ trans('app.table_no') }} |
{{ trans('app.name') }} |
+ {{ trans('app.label') }} |
{{ trans('role.users_count') }} |
{{ trans('app.action') }} |
@@ -97,6 +87,7 @@
@forelse($roles as $key => $role)
| {{ $key + 1 }} |
+ {{ $role->name }} |
{{ $role->label }} |
{{ $role->users()->count() }} |
diff --git a/routes/web/users.php b/routes/web/users.php
index f6ab042..796b171 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -8,13 +8,7 @@ Route::group(['middleware' => ['web','role:admin'], 'namespace' => 'Users'], fun
Route::resource('users','UsersController');
/**
- * Permissions Routes
- */
- Route::resource('permissions','PermissionsController');
-
- /**
* Roles Routes
*/
Route::resource('roles','RolesController');
- Route::post('roles/{id}/update-permissions', ['as' => 'roles.update-permissions', 'uses' => 'RolesController@updatePermissions']);
});
|