pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into 31-admin-user-management

Browse source 
# Conflicts:
#	app/forms/UserSettings.php
This commit is contained in:
Henrik Hautakoski 2022-08-08 23:35:37 +02:00
commit 4b750f0f37
70 changed files with 7831 additions and 5620 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/AuthController.php
View file

@ -12,13 +12,6 @@ use App\Controller\ControllerBase,
class AuthController extends ControllerBase
{
public function initialize()
{
// We need event manager here from DI.
$eventManager = $this->di->get('eventsManager');
$this->setEventsManager($eventManager);
}
public function indexAction()
{
$form = new LoginForm();
@ -74,7 +67,7 @@ class AuthController extends ControllerBase
$user->{'set' . $name . 'Id'}($data->getId());
$user->save();
$this->getEventsManager()->fire('user:onOAuthConnected', $user, $data);
$this->eventsManager->fire('user:onOAuthConnected', $user, $data);
$this->flash->message('success', sprintf("OAuth provider <strong>%s</strong> was connected!", $name));
$this->response->redirect('/settings');

6
app/controllers/CallbackController.php
View file

@ -25,11 +25,11 @@ class CallbackController extends ControllerBase
{
$paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10);
if ($paginator->getPaginate()->current > $paginator->getPaginate()->total_pages) {
if ($paginator->paginate()->current > $paginator->paginate()->last) {
$paginator->setCurrentPage(1);
}
$this->view->page = $paginator->getPaginate();
$this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/list/';
}
@ -111,7 +111,7 @@ class CallbackController extends ControllerBase
$paginator = $callback->getRequestPaginator($page, 30);
$this->view->item = $callback;
$this->view->page = $paginator->getPaginate();
$this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/show/' . $id . '/';
}
}

13
app/controllers/UserController.php
View file

@ -10,13 +10,6 @@ use App\Controller\ControllerBase,
class UserController extends ControllerBase
{
public function initialize()
{
// We need event manager here from DI.
$eventManager = $this->di->get('eventsManager');
$this->setEventsManager($eventManager);
}
public function settingsAction()
{
$user = $this->_getAuth()->getUser();
@ -112,10 +105,10 @@ class UserController extends ControllerBase
$paginator = ActivityLog::getPaginationList($user->getId(), $page);
$this->view->page = $paginator->getPaginate();
$this->view->page = $paginator->paginate();
$this->view->pagination_url = '/user/activity/';
}
public function oauthDisconnectAction($provider, $last_unlink_confirmed = false)
{
$user = $this->_getAuth()->getUser();
@ -156,7 +149,7 @@ class UserController extends ControllerBase
$user->{'set' . $provider . 'Id'}(null);
$user->save();
$this->getEventsManager()->fire('user:onOAuthDisconnect', $user, $provider);
$this->eventsManager->fire('user:onOAuthDisconnect', $user, $provider);
$this->flash->message('success', "<p><strong>{$provider}</strong> was disconnected</p>");

2
app/controllers/backend/LogController.php
View file

@ -15,7 +15,7 @@ class LogController extends \Phalcon\Mvc\Controller
{
$paginator = ActivityLog::getAllPaginationList($page);
$this->view->page = $paginator->getPaginate();
$this->view->page = $paginator->paginate();
$this->view->pagination_url = '/admin/log/';
}
}

2
app/controllers/backend/UserController.php
View file

@ -20,7 +20,7 @@ class UserController extends \Phalcon\Mvc\Controller
$paginator = User::getPaginationList($page,15);
$this->view->pagination_url = '/admin/user/list/';
$this->view->page = $paginator->getPaginate();
$this->view->page = $paginator->paginate();
}
public function newAction()