Merge branch 'dev' into user_management
This commit is contained in:
@@ -4,8 +4,10 @@ namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\CustomFieldResources;
|
||||
use App\Enumerations\CustomFieldTypes;
|
||||
use App\Events\CreateNewCustomField as CreateNewCustomFieldEvent;
|
||||
use App\Http\Requests\NewCustomFieldRequest;
|
||||
use App\Models\CustomField;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
|
||||
class CreateNewCustomField extends Controller
|
||||
{
|
||||
@@ -59,6 +61,9 @@ class CreateNewCustomField extends Controller
|
||||
|
||||
$customField->save();
|
||||
|
||||
// fire event about creating new custom field
|
||||
Event::fire(new CreateNewCustomFieldEvent($customField));
|
||||
|
||||
return redirect()
|
||||
->route('customfields.new')
|
||||
->with('success', trans('admin/customFields.successfullyCreated'));
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\UserRoles;
|
||||
use App\Events\CreateNewUser as CreateNewUserEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests;
|
||||
use App\Http\Requests\CreateNewUserRequest;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class CreateNewUser extends Controller
|
||||
@@ -51,6 +52,9 @@ class CreateNewUser extends Controller
|
||||
// store user into database
|
||||
$user->save();
|
||||
|
||||
// fire event
|
||||
Event::fire(new CreateNewUserEvent($user));
|
||||
|
||||
// refresh page with information about successfull registration
|
||||
return redirect()
|
||||
->route('users.new')
|
||||
|
||||
@@ -4,10 +4,13 @@ namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\CustomFieldResources;
|
||||
use App\Enumerations\CustomFieldTypes;
|
||||
use App\Events\DeleteCustomField;
|
||||
use App\Events\EditCustomField as EditCustomFieldEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests;
|
||||
use App\Http\Requests\EditCustomFieldRequest;
|
||||
use App\Models\CustomField;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
|
||||
class EditCustomField extends Controller
|
||||
{
|
||||
@@ -60,6 +63,9 @@ class EditCustomField extends Controller
|
||||
// save changes into database
|
||||
$customField->save();
|
||||
|
||||
// fire event about editing custom field
|
||||
Event::fire(new EditCustomFieldEvent($customField));
|
||||
|
||||
return redirect()
|
||||
->route('customfields.edit', ['id' => $id])
|
||||
->with('success', trans('admin/customFields.successfullyEdited'));
|
||||
@@ -89,6 +95,9 @@ class EditCustomField extends Controller
|
||||
// delete item
|
||||
$field->delete();
|
||||
|
||||
// fire event about editing custom field
|
||||
Event::fire(new DeleteCustomField($field));
|
||||
|
||||
// redirect back to overview
|
||||
return redirect()
|
||||
->route('customfields.overview')
|
||||
|
||||
@@ -4,11 +4,13 @@ namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\UserRoles;
|
||||
use App\Enumerations\UserStates;
|
||||
use App\Events\EditUser as EditUserEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests;
|
||||
use App\Http\Requests\EditUserRequest;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class EditUser extends Controller
|
||||
@@ -81,6 +83,9 @@ class EditUser extends Controller
|
||||
|
||||
$user->save();
|
||||
|
||||
// fire event about editing user
|
||||
Event::fire(new EditUserEvent($user));
|
||||
|
||||
return redirect()
|
||||
->route('users.detail', ['id' => $id])
|
||||
->with('success', trans('admin/userManagement.userSuccessfullyEdited'));
|
||||
|
||||
Reference in New Issue
Block a user