FEATURE: add form for setting default permissions and fix few bugs

This commit is contained in:
Michal Kváček
2017-08-23 21:34:56 +02:00
parent 0aaa626124
commit e0f5cba9a4
31 changed files with 150 additions and 482 deletions
@@ -2,19 +2,19 @@
namespace App\Http\Controllers\Admin\Dashboard;
use App\CMS\Repositories\Module;
use App\CMS\Contracts\Repositories\Module;
use App\Http\Controllers\Admin\Controller;
use App\Models\Content\Content;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class Dashboard extends Controller
{
public function index(Request $request)
public function index()
{
$contentModules = app(Module::class)->getContentModules();
if (\Auth::user()->can('manage', Content::class) && !$contentModules->isEmpty()) {
if (\Auth::user()
->can('manage', Content::class) && !$contentModules->isEmpty()) {
return redirect()->route('content.overview');
} else {
return redirect()->route('users.detail', ['user' => Auth::user()]);
+24 -22
View File
@@ -3,39 +3,41 @@
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Requests\Request;
use App\Models\Permissions\Permission;
use App\Models\User;
use Illuminate\Http\Request;
class Permissions extends Controller
{
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
*
* @return \Illuminate\Http\Response
* Display all permissions
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function update(Request $request, User $user)
public function index()
{
$permissionIds = $request->get('permissions', []);
$permissions = Permission::whereIn('string_id', array_keys($permissionIds))
->get();
$permissions = Permission::whereNull('parent_id')->get();
\DB::transaction(function () use ($user, $permissions) {
// remove all permissions
$user->permissions()
->detach();
return view('admin/permissions.index', compact('permissions'));
}
foreach ($permissions as $permission) {
$user->permissions()
->attach($permission->id);
}
});
/**
* Setup default permissions
*
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse
*/
public function setDefault(Request $request)
{
Permission::where('default', true)
->update(['default' => false]);
$permissions = $request->permissions;
Permission::whereIn('string_id', array_keys($permissions))
->update(['default' => true]);
return redirect()
->back()
->with('success', trans('admin/permissions.successfullySet'));
->with('success', trans('admin/permissions.defaultSuccessfullySet'));
}
}
@@ -8,8 +8,11 @@ use App\CMS\Repositories\Users\User as UserRepository;
use App\Events\EditUser as EditUserEvent;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditUserRequest;
use App\Http\Requests\Request;
use App\Models\Permissions\Permission;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
class EditUser extends Controller
@@ -82,4 +85,34 @@ class EditUser extends Controller
->back()
->with('success', trans('admin/userManagement.userSuccessfullyEdited'));
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function setPermissions(Request $request, User $user)
{
$permissionIds = $request->get('permissions', []);
$permissions = Permission::whereIn('string_id', array_keys($permissionIds))
->get();
DB::transaction(function () use ($user, $permissions) {
// remove all permissions
$user->permissions()
->detach();
foreach ($permissions as $permission) {
$user->permissions()
->attach($permission->id);
}
});
return redirect()
->back()
->with('success', trans('admin/permissions.successfullySet'));
}
}