1
0
mirror of https://github.com/flextype/flextype.git synced 2025-08-08 14:16:46 +02:00

Flextype Box Plugin: Admin #125 #117

- fixes and refactoring
This commit is contained in:
Awilum
2019-06-09 01:24:37 +03:00
parent 41c1f6d27f
commit a08d71e067
2 changed files with 13 additions and 13 deletions

View File

@@ -76,7 +76,7 @@ class FieldsetsController extends Controller
$this->flash->addMessage('error', __('admin_message_fieldset_was_not_created'));
}
return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index'));
return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
}
public function edit($request, $response)
@@ -114,7 +114,7 @@ class FieldsetsController extends Controller
$this->flash->addMessage('error', __('admin_message_fieldsets_was_not_saved'));
}
return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index'));
return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
}
public function rename($request, $response)
@@ -149,7 +149,7 @@ class FieldsetsController extends Controller
$this->flash->addMessage('error', __('admin_message_fieldset_was_not_renamed'));
}
return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index'));
return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
}
public function deleteProcess($request, $response)
@@ -160,7 +160,7 @@ class FieldsetsController extends Controller
$this->flash->addMessage('error', __('admin_message_fieldset_was_not_deleted'));
}
return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index'));
return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
}
public function duplicateProcess($request, $response)
@@ -171,6 +171,6 @@ class FieldsetsController extends Controller
$this->flash->addMessage('error', __('admin_message_fieldset_was_not_duplicated'));
}
return $response->withRedirect($this->container->get('router')->pathFor('admin.fieldsets.index'));
return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
}
}

View File

@@ -28,7 +28,7 @@ class UsersController extends Controller
'plugins/admin/views/templates/users/login.html'
);
} else {
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
}
}
@@ -42,14 +42,14 @@ class UsersController extends Controller
if (password_verify(trim($data['password']), $user_file['hashed_password'])) {
Session::set('username', $user_file['username']);
Session::set('role', $user_file['role']);
return $response->withRedirect($this->container->get('router')->pathFor('admin.entries.index'));
return $response->withRedirect($this->router->pathFor('admin.entries.index'));
} else {
$this->flash->addMessage('error', __('admin_message_wrong_username_password'));
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.login'));
return $response->withRedirect($this->router->pathFor('admin.users.login'));
}
} else {
$this->flash->addMessage('error', __('admin_message_wrong_username_password'));
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.login'));
return $response->withRedirect($this->router->pathFor('admin.users.login'));
}
}
@@ -79,12 +79,12 @@ class UsersController extends Controller
'role' => 'admin',
'state' => 'enabled'])
)) {
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.login'));
return $response->withRedirect($this->router->pathFor('admin.users.login'));
} else {
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
}
} else {
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
}
}
@@ -94,6 +94,6 @@ class UsersController extends Controller
public function logoutProcess($request, $response)
{
Session::destroy();
return $response->withRedirect($this->container->get('router')->pathFor('admin.users.login'));
return $response->withRedirect($this->router->pathFor('admin.users.login'));
}
}