Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-10 18:37:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Added URI signature for JS and CSS resources

Browse Source 
* [MOD] Improved requests handling. It makes them more testing friendly
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-07-08 23:05:30 +02:00
parent 53a2552c05
commit a97b92131f
63 changed files with 914 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/modules/web/Controllers/UserGroupController.php
View File

@@ -30,7 +30,6 @@ use SP\Core\Events\EventMessage;
use SP\Core\Exceptions\ValidationException;
use SP\DataModel\UserGroupData;
use SP\Http\JsonResponse;
use SP\Http\Request;
use SP\Modules\Web\Controllers\Helpers\ItemsGridHelper;
use SP\Modules\Web\Controllers\Traits\ItemTrait;
use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -72,7 +71,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
}
$this->view->addTemplate('datagrid-table', 'grid');
$this->view->assign('index', Request::analyzeInt('activetab', 0));
$this->view->assign('index', $this->request->analyzeInt('activetab', 0));
$this->view->assign('data', $this->getSearchGrid());
$this->returnJsonResponseData(['html' => $this->render()]);
@@ -88,7 +87,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
protected function getSearchGrid()
{
$itemsGridHelper = $this->dic->get(ItemsGridHelper::class);
$itemSearchData = $this->getSearchData($this->configData->getAccountCount());
$itemSearchData = $this->getSearchData($this->configData->getAccountCount(), $this->request);
return $itemsGridHelper->updatePager($itemsGridHelper->getUserGroupsGrid($this->userGroupService->search($itemSearchData)), $itemSearchData);
}
@@ -201,7 +200,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
try {
if ($id === null) {
$this->userGroupService->deleteByIdBatch($this->getItemsIdFromRequest());
$this->userGroupService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
$this->deleteCustomFieldsForItem(Acl::GROUP, $id);
@@ -247,7 +246,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$id = $this->userGroupService->create($groupData, $groupData->getUsers());
$this->addCustomFieldsForItem(Acl::GROUP, $id);
$this->addCustomFieldsForItem(Acl::GROUP, $id, $this->request);
$this->eventDispatcher->notifyEvent('create.userGroup',
new Event($this, EventMessage::factory()
@@ -287,7 +286,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->userGroupService->update($groupData);
$this->updateCustomFieldsForItem(Acl::GROUP, $id);
$this->updateCustomFieldsForItem(Acl::GROUP, $id, $this->request);
$this->eventDispatcher->notifyEvent('edit.userGroup',
new Event($this, EventMessage::factory()