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

* [FIX] Client custom fields were not created/saved. Thanks to @ZUNbado and @sf32738 for the notice. Closes #1375

Browse Source 
* [MOD] Minor code tweaks

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2019-07-20 21:44:04 +02:00
parent b5559b52eb
commit 98a68f47c5
32 changed files with 160 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,13 +27,12 @@ namespace SP\Modules\Web\Controllers;
use DI\DependencyException;
use DI\NotFoundException;
use Exception;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use SP\Core\Acl\Acl;
use SP\Core\Events\Event;
use SP\Core\Events\EventMessage;
use SP\Core\Exceptions\ConstraintException;
use SP\Core\Exceptions\QueryException;
use SP\Core\Exceptions\SessionTimeout;
use SP\Core\Exceptions\SPException;
use SP\Core\Exceptions\ValidationException;
use SP\DataModel\UserGroupData;
@@ -234,18 +233,18 @@ final class UserGroupController extends ControllerBase implements CrudController
if ($id === null) {
$this->userGroupService->deleteByIdBatch($this->getItemsIdFromRequest($this->request));
$this->deleteCustomFieldsForItem(Acl::GROUP, $id);
$this->eventDispatcher->notifyEvent('delete.userGroup.selection',
new Event($this, EventMessage::factory()->addDescription(__u('Groups deleted')))
$this->eventDispatcher->notifyEvent(
'delete.userGroup.selection',
new Event($this, EventMessage::factory()
->addDescription(__u('Groups deleted')))
);
$this->deleteCustomFieldsForItem(Acl::GROUP, $id);
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Groups deleted'));
} else {
$this->userGroupService->delete($id);
$this->deleteCustomFieldsForItem(Acl::GROUP, $id);
$this->eventDispatcher->notifyEvent('delete.userGroup',
new Event($this, EventMessage::factory()
->addDescription(__u('Group deleted'))
@@ -253,6 +252,8 @@ final class UserGroupController extends ControllerBase implements CrudController
->addExtra('userGroupId', $id))
);
$this->deleteCustomFieldsForItem(Acl::GROUP, $id);
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group deleted'));
}
} catch (Exception $e) {
@@ -283,14 +284,14 @@ final class UserGroupController extends ControllerBase implements CrudController
$id = $this->userGroupService->create($groupData);
$this->addCustomFieldsForItem(Acl::GROUP, $id, $this->request);
$this->eventDispatcher->notifyEvent('create.userGroup',
new Event($this, EventMessage::factory()
->addDescription(__u('Group added'))
->addDetail(__u('Name'), $groupData->getName()))
);
$this->addCustomFieldsForItem(Acl::GROUP, $id, $this->request);
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group added'));
} catch (ValidationException $e) {
return $this->returnJsonResponseException($e);
@@ -326,8 +327,6 @@ final class UserGroupController extends ControllerBase implements CrudController
$this->userGroupService->update($groupData);
$this->updateCustomFieldsForItem(Acl::GROUP, $id, $this->request);
$this->eventDispatcher->notifyEvent('edit.userGroup',
new Event($this, EventMessage::factory()
->addDescription(__u('Group updated'))
@@ -335,6 +334,8 @@ final class UserGroupController extends ControllerBase implements CrudController
->addExtra('userGroupId', $id))
);
$this->updateCustomFieldsForItem(Acl::GROUP, $id, $this->request);
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Group updated'));
} catch (ValidationException $e) {
return $this->returnJsonResponseException($e);
@@ -383,9 +384,10 @@ final class UserGroupController extends ControllerBase implements CrudController
/**
* Initialize class
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws AuthException
* @throws DependencyException
* @throws NotFoundException
* @throws SessionTimeout
*/
protected function initialize()
{