¨4.0.1¨
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Modules\User\Http\Controllers\Admin;
|
||||
|
||||
use Illuminate\Http\Response;
|
||||
use Modules\User\Entities\User;
|
||||
use Modules\Admin\Traits\HasCrudActions;
|
||||
use Modules\User\Http\Requests\SaveUserRequest;
|
||||
@@ -39,11 +40,13 @@ class UserController
|
||||
*/
|
||||
protected $validation = SaveUserRequest::class;
|
||||
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Modules\User\Http\Requests\SaveUserRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param SaveUserRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function store(SaveUserRequest $request)
|
||||
{
|
||||
@@ -56,15 +59,17 @@ class UserController
|
||||
Activation::complete($user, Activation::create($user)->code);
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
|
||||
->withSuccess(trans('admin::messages.resource_created', ['resource' => trans('user::users.user')]));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param int $id
|
||||
* @param \Modules\User\Http\Requests\SaveUserRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
* @param SaveUserRequest $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function update($id, SaveUserRequest $request)
|
||||
{
|
||||
@@ -80,7 +85,7 @@ class UserController
|
||||
|
||||
$user->roles()->sync($request->roles);
|
||||
|
||||
if (! Activation::completed($user) && $request->activated === '1') {
|
||||
if (!Activation::completed($user) && $request->activated === '1') {
|
||||
Activation::complete($user, Activation::create($user)->code);
|
||||
}
|
||||
|
||||
@@ -89,6 +94,6 @@ class UserController
|
||||
}
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
|
||||
->withSuccess(trans('admin::messages.resource_updated', ['resource' => trans('user::users.user')]));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user