Merge remote-tracking branch 'origin/ticket775' into develop
This commit is contained in:
commit
8523e6e459
2 changed files with 10 additions and 6 deletions
|
|
@ -34,6 +34,11 @@ class UserController extends Controller
|
|||
$model->sendMailConfirm();
|
||||
}
|
||||
|
||||
public function passwordReset()
|
||||
{
|
||||
return view('users.passwordReset');
|
||||
}
|
||||
|
||||
public function passwordResetSubmit()
|
||||
{
|
||||
/** @var \App\Models\User */
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@ Route::middleware(['throttle:credentials'])->group(function () {
|
|||
'logout' => true,
|
||||
'register' => false,
|
||||
'reset' => true,
|
||||
// for resetting passwords
|
||||
// for resetting passwords
|
||||
'confirm' => true,
|
||||
// for additional password confirmations
|
||||
// for additional password confirmations
|
||||
'verify' => false,
|
||||
// for email verification
|
||||
// for email verification
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
@ -50,9 +50,8 @@ Route::get('/ping', function () {
|
|||
Route::middleware(['auth'])->group(function () {
|
||||
|
||||
// Logged user actions
|
||||
Route::view('/users/change-password', 'users.passwordReset')->name('users.passwordReset');
|
||||
Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])
|
||||
->name('users.passwordResetSubmit');
|
||||
Route::get('/users/change-password', [UserController::class, 'passwordReset'])->name('users.passwordReset');
|
||||
Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])->name('users.passwordResetSubmit');
|
||||
Route::get('/users/stats', [UserController::class, 'stats'])->name('users.stats');
|
||||
|
||||
// Ticket
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue