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

* [FIX] Fixed custom fields behavior.

Browse Source
This commit is contained in:
nuxsmin
2018-03-15 00:14:38 +01:00
parent 182735b445
commit 74ceb8dc8c
13 changed files with 389 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/SP/Repositories/CustomField/CustomFieldDefRepository.php
View File

@@ -24,7 +24,6 @@
namespace SP\Repositories\CustomField;
use SP\Core\Acl\ActionsInterface;
use SP\Core\Exceptions\SPException;
use SP\DataModel\CustomFieldDefinitionData;
use SP\DataModel\ItemSearchData;
@@ -43,36 +42,6 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
{
use RepositoryItemTrait;
/**
* @param $id
* @return mixed
*/
public static function getFieldModuleById($id)
{
$modules = self::getFieldModules();
return isset($modules[$id]) ? $modules[$id] : $id;
}
/**
* Devuelve los módulos disponibles para los campos personalizados
*
* @return array
*/
public static function getFieldModules()
{
$modules = [
ActionsInterface::ACCOUNT => __('Cuentas'),
ActionsInterface::CATEGORY => __('Categorías'),
ActionsInterface::CLIENT => __('Clientes'),
ActionsInterface::USER => __('Usuarios'),
ActionsInterface::GROUP => __('Grupos')
];
return $modules;
}
/**
* Creates an item
*
@@ -84,7 +53,7 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
public function create($itemData)
{
$query = /** @lang SQL */
'INSERT INTO CustomFieldDefinition SET name = ?, moduleId = ?, required = ?, help = ?, showInList = ?, typeId = ?';
'INSERT INTO CustomFieldDefinition SET `name` = ?, moduleId = ?, required = ?, `help` = ?, showInList = ?, typeId = ?';
$queryData = new QueryData();
$queryData->setQuery($query);
@@ -113,7 +82,7 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
{
$query = /** @lang SQL */
'UPDATE CustomFieldDefinition
SET name = ?, moduleId = ?, required = ?, help = ?, showInList = ?, typeId = ?
SET `name` = ?, moduleId = ?, required = ?, `help` = ?, showInList = ?, typeId = ?
WHERE id = ? LIMIT 1';
$queryData = new QueryData();
@@ -139,14 +108,14 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
public function getById($id)
{
$query = /** @lang SQL */
'SELECT id, name, moduleId, required, help, showInList, typeId
'SELECT id, `name`, moduleId, required, `help`, showInList, typeId
FROM CustomFieldDefinition
WHERE id = ? LIMIT 1';
$queryData = new QueryData();
$queryData->setMapClassName(CustomFieldDefinitionData::class);
$queryData->setQuery($query);
$queryData->addParam($id);
$queryData->setMapClassName(CustomFieldDefinitionData::class);
return DbWrapper::getResults($queryData, $this->db);
}
@@ -159,13 +128,13 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
public function getAll()
{
$query = /** @lang SQL */
'SELECT id, name, moduleId, required, help, showInList
'SELECT id, `name`, moduleId, required, `help`, showInList
FROM CustomFieldDefinition
ORDER BY moduleId';
$queryData = new QueryData();
$queryData->setMapClassName(CustomFieldDefinitionData::class);
$queryData->setQuery($query);
$queryData->setMapClassName(CustomFieldDefinitionData::class);
return DbWrapper::getResultsArray($queryData, $this->db);
}
@@ -179,14 +148,14 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
public function getByIdBatch(array $ids)
{
$query = /** @lang SQL */
'SELECT id, name, moduleId, required, help, showInList, typeId
'SELECT id, `name`, moduleId, required, `help`, showInList, typeId
FROM CustomFieldDefinition
WHERE id IN (' . $this->getParamsFromArray($ids) . ')';
$queryData = new QueryData();
$queryData->setMapClassName(CustomFieldDefinitionData::class);
$queryData->setQuery($query);
$queryData->setParams($ids);
$queryData->setMapClassName(CustomFieldDefinitionData::class);
return DbWrapper::getResults($queryData, $this->db);
}
@@ -202,10 +171,6 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
*/
public function deleteByIdBatch(array $ids)
{
if ($this->deleteItemsDataForDefinitionBatch($ids) === false) {
throw new SPException(__u('Error al eliminar los campos personalizados'), SPException::ERROR);
}
$query = /** @lang SQL */
'DELETE FROM CustomFieldDefinition WHERE id IN (' . $this->getParamsFromArray($ids) . ')';
@@ -219,25 +184,6 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
return $this->db->getNumRows();
}
/**
* Eliminar los datos de los elementos de una definición
*
* @param array $ids
* @return bool
* @throws \SP\Core\Exceptions\ConstraintException
* @throws \SP\Core\Exceptions\QueryException
*/
protected function deleteItemsDataForDefinitionBatch(array $ids)
{
$queryData = new QueryData();
$queryData->setQuery('DELETE FROM CustomFieldData WHERE id IN (' . $this->getParamsFromArray($ids) . ')');
$queryData->setParams($ids);
DbWrapper::getQuery($queryData, $this->db);
return $this->db->getNumRows();
}
/**
* Deletes an item
*
@@ -249,10 +195,6 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
*/
public function delete($id)
{
if ($this->deleteItemsDataForDefinition($id) === false) {
throw new SPException(__u('Error al eliminar el campo personalizado'), SPException::ERROR);
}
$queryData = new QueryData();
$queryData->setQuery('DELETE FROM CustomFieldDefinition WHERE id = ? LIMIT 1');
$queryData->addParam($id);
@@ -261,22 +203,6 @@ class CustomFieldDefRepository extends Repository implements RepositoryItemInter
return DbWrapper::getQuery($queryData, $this->db);
}
/**
* Eliminar los datos de los elementos de una definición
*
* @param $id
* @return bool
* @throws \SP\Core\Exceptions\SPException
*/
protected function deleteItemsDataForDefinition($id)
{
$queryData = new QueryData();
$queryData->setQuery('DELETE FROM CustomFieldData WHERE id = ?');
$queryData->addParam($id);
return DbWrapper::getQuery($queryData, $this->db);
}
/**
* Checks whether the item is in use or not
*