@ -22,7 +22,7 @@ class ExtraFieldValue extends Model
public $columns = [ public $columns = [
'id', 'id',
'field_id', 'field_id',
'value', 'field_ value',
'comment', 'comment',
'item_id', 'item_id',
'asset_id', 'asset_id',
@ -70,8 +70,8 @@ class ExtraFieldValue extends Model
$em = Database::getManager(); $em = Database::getManager();
$query = $em->getRepository(ExtraFieldValues::class)->createQueryBuilder('e'); $query = $em->getRepository(ExtraFieldValues::class)->createQueryBuilder('e');
$query->select('count(e.id)'); $query->select('count(e.id)');
$query->where('e.extraField Type = :type'); $query->where('e.item Type = :type');
$query->setParameter('type', $this->getExtraField()->getExtraField Type()); $query->setParameter('type', $this->getExtraField()->getItem Type());
return $query->getQuery()->getSingleScalarResult(); return $query->getQuery()->getSingleScalarResult();
} }
@ -116,7 +116,7 @@ class ExtraFieldValue extends Model
return false; return false;
} }
$type = $this->getExtraField()->getExtraField Type(); $type = $this->getExtraField()->getItem Type();
$extraField = new ExtraField($this->type); $extraField = new ExtraField($this->type);
$extraFields = $extraField->get_all([], 'option_order'); $extraFields = $extraField->get_all([], 'option_order');
@ -171,7 +171,7 @@ class ExtraFieldValue extends Model
$commentVariable = 'extra_'.$field_variable.'_comment'; $commentVariable = 'extra_'.$field_variable.'_comment';
$comment = $params[$commentVariable] ?? null; $comment = $params[$commentVariable] ?? null;
switch ($extraFieldInfo['field _type']) { switch ($extraFieldInfo['value _type']) {
case ExtraField::FIELD_TYPE_GEOLOCALIZATION_COORDINATES: case ExtraField::FIELD_TYPE_GEOLOCALIZATION_COORDINATES:
case ExtraField::FIELD_TYPE_GEOLOCALIZATION: case ExtraField::FIELD_TYPE_GEOLOCALIZATION:
if (!empty($value)) { if (!empty($value)) {
@ -181,7 +181,7 @@ class ExtraFieldValue extends Model
$newParams = [ $newParams = [
'item_id' => $params['item_id'], 'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'], 'field_id' => $extraFieldInfo['id'],
'value' => $value, 'field_ value' => $value,
'comment' => $comment, 'comment' => $comment,
]; ];
self::save($newParams, $showQuery); self::save($newParams, $showQuery);
@ -281,7 +281,7 @@ class ExtraFieldValue extends Model
$extraFieldValues = (new ExtraFieldValues()) $extraFieldValues = (new ExtraFieldValues())
->setItemId((int) $params['item_id']) ->setItemId((int) $params['item_id'])
->setField($field) ->setField($field)
->setValue(1) ->setField Value(1)
->setAsset($asset) ->setAsset($asset)
->setComment($comment ?? '') ->setComment($comment ?? '')
; ;
@ -317,7 +317,7 @@ class ExtraFieldValue extends Model
$extraFieldValues = (new ExtraFieldValues()) $extraFieldValues = (new ExtraFieldValues())
->setItemId((int) $params['item_id']) ->setItemId((int) $params['item_id'])
->setField($field) ->setField($field)
->setValue(1) ->setField Value(1)
->setAsset($asset) ->setAsset($asset)
->setComment($comment ?? '') ->setComment($comment ?? '')
; ;
@ -338,7 +338,7 @@ class ExtraFieldValue extends Model
$newParams = [ $newParams = [
'item_id' => $params['item_id'], 'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'], 'field_id' => $extraFieldInfo['id'],
'value' => $fieldToSave, 'field_ value' => $fieldToSave,
'comment' => $comment, 'comment' => $comment,
]; ];
$this->save($newParams); $this->save($newParams);
@ -351,7 +351,7 @@ class ExtraFieldValue extends Model
$newParams = [ $newParams = [
'item_id' => $params['item_id'], 'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'], 'field_id' => $extraFieldInfo['id'],
'value' => $value, 'field_ value' => $value,
'comment' => $comment, 'comment' => $comment,
]; ];
$this->save($newParams, $showQuery); $this->save($newParams, $showQuery);
@ -364,7 +364,7 @@ class ExtraFieldValue extends Model
$newParams = [ $newParams = [
'item_id' => $params['item_id'], 'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'], 'field_id' => $extraFieldInfo['id'],
'value' => $value, 'field_ value' => $value,
'comment' => $comment, 'comment' => $comment,
]; ];
$this->save($newParams, $showQuery); $this->save($newParams, $showQuery);
@ -374,7 +374,7 @@ class ExtraFieldValue extends Model
$newParams = [ $newParams = [
'item_id' => $params['item_id'], 'item_id' => $params['item_id'],
'field_id' => $extraFieldInfo['id'], 'field_id' => $extraFieldInfo['id'],
'value' => $value, 'field_ value' => $value,
'comment' => $comment, 'comment' => $comment,
]; ];
$this->save($newParams, $showQuery); $this->save($newParams, $showQuery);
@ -427,7 +427,7 @@ class ExtraFieldValue extends Model
$extra_field = $this->getExtraField(); $extra_field = $this->getExtraField();
// Setting value to insert. // Setting value to insert.
$value = $params['value']; $value = $params['field_ value'];
$value_to_insert = null; $value_to_insert = null;
if (is_array($value)) { if (is_array($value)) {
@ -436,7 +436,7 @@ class ExtraFieldValue extends Model
$value_to_insert = $value; $value_to_insert = $value;
} }
$params['value'] = $value_to_insert; $params['field_ value'] = $value_to_insert;
// If field id exists // If field id exists
if (isset($params['field_id'])) { if (isset($params['field_id'])) {
@ -452,7 +452,7 @@ class ExtraFieldValue extends Model
} }
if ($extraFieldInfo) { if ($extraFieldInfo) {
switch ($extraFieldInfo['field _type']) { switch ($extraFieldInfo['value _type']) {
case ExtraField::FIELD_TYPE_RADIO: case ExtraField::FIELD_TYPE_RADIO:
case ExtraField::FIELD_TYPE_SELECT: case ExtraField::FIELD_TYPE_SELECT:
break; break;
@ -493,7 +493,7 @@ class ExtraFieldValue extends Model
break; break;
} }
if (ExtraField::FIELD_TYPE_TAG == $extraFieldInfo['field _type']) { if (ExtraField::FIELD_TYPE_TAG == $extraFieldInfo['value _type']) {
$field_values = self::getAllValuesByItemAndFieldAndValue( $field_values = self::getAllValuesByItemAndFieldAndValue(
$params['item_id'], $params['item_id'],
$params['field_id'], $params['field_id'],
@ -506,7 +506,7 @@ class ExtraFieldValue extends Model
); );
} }
$params['value'] = $value_to_insert; $params['field_ value'] = $value_to_insert;
//$params['author_id'] = api_get_user_id(); //$params['author_id'] = api_get_user_id();
// Insert // Insert
@ -514,20 +514,20 @@ class ExtraFieldValue extends Model
/* Enable this when field_loggeable is introduced as a table field (2.0) /* Enable this when field_loggeable is introduced as a table field (2.0)
if ($extraFieldInfo['field_loggeable'] == 1) { if ($extraFieldInfo['field_loggeable'] == 1) {
*/ */
if (ExtraField::FIELD_TYPE_TAG == $extraFieldInfo['field _type']) { if (ExtraField::FIELD_TYPE_TAG == $extraFieldInfo['value _type']) {
$option = new ExtraFieldOption($this->type); $option = new ExtraFieldOption($this->type);
$optionExists = $option->get($params['value']); $optionExists = $option->get($params['value']);
if (empty($optionExists)) { if (empty($optionExists)) {
$optionParams = [ $optionParams = [
'field_id' => $params['field_id'], 'field_id' => $params['field_id'],
'option_value' => $params['value'], 'option_value' => $params['field_ value'],
]; ];
$optionId = $option->saveOptions($optionParams); $optionId = $option->saveOptions($optionParams);
} else { } else {
$optionId = $optionExists['id']; $optionId = $optionExists['id'];
} }
$params['value'] = $optionId; $params['field_ value'] = $optionId;
if ($optionId) { if ($optionId) {
return parent::save($params, $showQuery); return parent::save($params, $showQuery);
} }
@ -561,23 +561,23 @@ class ExtraFieldValue extends Model
$field_id = (int) $field_id; $field_id = (int) $field_id;
$item_id = Database::escape_string($item_id); $item_id = Database::escape_string($item_id);
$sql = "SELECT s.*, field _type FROM {$this->table} s $sql = "SELECT s.*, value _type FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
ON (s.field_id = sf.id) ON (s.field_id = sf.id)
WHERE WHERE
item_id = '$item_id' AND item_id = '$item_id' AND
field_id = $field_id AND field_id = $field_id AND
sf.extra_field_type = ".$this->getExtraField()->getExtraField Type()." sf.item_type = ".$this->getExtraField()->getItem Type()."
ORDER BY id"; ORDER BY id";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
$result = Database::fetch_array($result, 'ASSOC'); $result = Database::fetch_array($result, 'ASSOC');
if ($transform) { if ($transform) {
if (!empty($result['value'])) { if (!empty($result['field_ value'])) {
switch ($result['field _type']) { switch ($result['value _type']) {
case ExtraField::FIELD_TYPE_DOUBLE_SELECT: case ExtraField::FIELD_TYPE_DOUBLE_SELECT:
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$options = explode('::', $result['value']); $options = explode('::', $result['field_ value']);
// only available for PHP 5.4 :( $result['field_value'] = $field_option->get($options[0])['id'].' -> '; // only available for PHP 5.4 :( $result['field_value'] = $field_option->get($options[0])['id'].' -> ';
$result = $field_option->get($options[0]); $result = $field_option->get($options[0]);
$result_second = $field_option->get($options[1]); $result_second = $field_option->get($options[1]);
@ -587,7 +587,7 @@ class ExtraFieldValue extends Model
} }
break; break;
case ExtraField::FIELD_TYPE_SELECT_MULTIPLE: case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
$optionIds = explode(';', $result['value']); $optionIds = explode(';', $result['field_ value']);
$optionValues = []; $optionValues = [];
$objEfOption = new ExtraFieldOption($this->type); $objEfOption = new ExtraFieldOption($this->type);
$options = $objEfOption->get_field_options_by_field($result['field_id']); $options = $objEfOption->get_field_options_by_field($result['field_id']);
@ -608,7 +608,7 @@ class ExtraFieldValue extends Model
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$extra_field_option_result = $field_option->get_field_option_by_field_and_option( $extra_field_option_result = $field_option->get_field_option_by_field_and_option(
$result['field_id'], $result['field_id'],
$result['value'] $result['field_ value']
); );
if (isset($extra_field_option_result[0])) { if (isset($extra_field_option_result[0])) {
@ -617,7 +617,7 @@ class ExtraFieldValue extends Model
break; break;
case ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD: case ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD:
$options = explode('::', $result['value']); $options = explode('::', $result['field_ value']);
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$result = $field_option->get($options[0]); $result = $field_option->get($options[0]);
@ -626,7 +626,7 @@ class ExtraFieldValue extends Model
} }
break; break;
case ExtraField::FIELD_TYPE_TRIPLE_SELECT: case ExtraField::FIELD_TYPE_TRIPLE_SELECT:
$optionIds = explode(';', $result['value']); $optionIds = explode(';', $result['field_ value']);
$optionValues = []; $optionValues = [];
foreach ($optionIds as $optionId) { foreach ($optionIds as $optionId) {
$objEfOption = new ExtraFieldOption($this->type); $objEfOption = new ExtraFieldOption($this->type);
@ -659,17 +659,17 @@ class ExtraFieldValue extends Model
$limit = (int) $limit; $limit = (int) $limit;
$tag = Database::escape_string($tag); $tag = Database::escape_string($tag);
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT DISTINCT s.value, s.field_id $sql = "SELECT DISTINCT s.field_ value, s.field_id
FROM {$this->table} s FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
ON (s.field_id = sf.id) ON (s.field_id = sf.id)
WHERE WHERE
field_id = $field_id AND field_id = $field_id AND
value LIKE '%$tag%' AND field_ value LIKE '%$tag%' AND
sf.extra_field _type = ".$extraFieldType." sf.item _type = ".$extraFieldType."
ORDER BY value ORDER BY field_ value
LIMIT 0, $limit LIMIT 0, $limit
"; ";
$result = Database::query($sql); $result = Database::query($sql);
@ -703,16 +703,16 @@ class ExtraFieldValue extends Model
) { ) {
$item_id = (int) $item_id; $item_id = (int) $item_id;
$field_variable = Database::escape_string($field_variable); $field_variable = Database::escape_string($field_variable);
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT s.*, field _type $sql = "SELECT s.*, value _type
FROM {$this->table} s FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
ON (s.field_id = sf.id) ON (s.field_id = sf.id)
WHERE WHERE
item_id = '$item_id' AND item_id = '$item_id' AND
variable = '".$field_variable."' AND variable = '".$field_variable."' AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
"; ";
if ($filterByVisibility) { if ($filterByVisibility) {
$visibility = (int) $visibility; $visibility = (int) $visibility;
@ -726,11 +726,11 @@ class ExtraFieldValue extends Model
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
$result = Database::fetch_array($result, 'ASSOC'); $result = Database::fetch_array($result, 'ASSOC');
if ($transform) { if ($transform) {
$fieldType = $result['field _type']; $fieldType = $result['value _type'];
if (ExtraField::FIELD_TYPE_DOUBLE_SELECT == $fieldType) { if (ExtraField::FIELD_TYPE_DOUBLE_SELECT == $fieldType) {
if (!empty($result['value'])) { if (!empty($result['field_ value'])) {
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$options = explode('::', $result['value']); $options = explode('::', $result['field_ value']);
$result = $field_option->get($options[0]); $result = $field_option->get($options[0]);
$result_second = $field_option->get($options[1]); $result_second = $field_option->get($options[1]);
if (!empty($result)) { if (!empty($result)) {
@ -740,8 +740,8 @@ class ExtraFieldValue extends Model
} }
} }
if (ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD == $fieldType) { if (ExtraField::FIELD_TYPE_SELECT_WITH_TEXT_FIELD == $fieldType) {
if (!empty($result['value'])) { if (!empty($result['field_ value'])) {
$options = explode('::', $result['value']); $options = explode('::', $result['field_ value']);
$field_option = new ExtraFieldOption($this->type); $field_option = new ExtraFieldOption($this->type);
$result = $field_option->get($options[0]); $result = $field_option->get($options[0]);
if (!empty($result)) { if (!empty($result)) {
@ -752,8 +752,8 @@ class ExtraFieldValue extends Model
} }
} }
if (ExtraField::FIELD_TYPE_TRIPLE_SELECT == $fieldType) { if (ExtraField::FIELD_TYPE_TRIPLE_SELECT == $fieldType) {
if (!empty($result['value'])) { if (!empty($result['field_ value'])) {
$optionIds = explode(';', $result['value']); $optionIds = explode(';', $result['field_ value']);
$optionValues = []; $optionValues = [];
foreach ($optionIds as $optionId) { foreach ($optionIds as $optionId) {
$objEfOption = new ExtraFieldOption('user'); $objEfOption = new ExtraFieldOption('user');
@ -766,7 +766,7 @@ class ExtraFieldValue extends Model
} }
} }
if (in_array($result['field _type'], ExtraField::getExtraFieldTypesWithFiles())) { if (in_array($result['value _type'], ExtraField::getExtraFieldTypesWithFiles())) {
$result['url'] = ''; $result['url'] = '';
if (!empty($result['asset_id'])) { if (!empty($result['asset_id'])) {
$asset = $repo->find($result['asset_id']); $asset = $repo->find($result['asset_id']);
@ -808,11 +808,11 @@ class ExtraFieldValue extends Model
$value = Database::escape_string($value); $value = Database::escape_string($value);
$variable = Database::escape_string($variable); $variable = Database::escape_string($variable);
$valueCondition = " value = '$value' AND "; $valueCondition = " field_ value = '$value' AND ";
if ($useLike) { if ($useLike) {
$valueCondition = " value LIKE '%".$value."%' AND "; $valueCondition = " field_ value LIKE '%".$value."%' AND ";
} }
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT item_id FROM {$this->table} s $sql = "SELECT item_id FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
@ -820,7 +820,7 @@ class ExtraFieldValue extends Model
WHERE WHERE
$valueCondition $valueCondition
variable = '".$variable."' AND variable = '".$variable."' AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
ORDER BY item_id ORDER BY item_id
"; ";
@ -854,15 +854,15 @@ class ExtraFieldValue extends Model
public function getValuesByFieldId($fieldId) public function getValuesByFieldId($fieldId)
{ {
$fieldId = (int) $fieldId; $fieldId = (int) $fieldId;
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT s.* FROM {$this->table} s $sql = "SELECT s.* FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
ON (s.field_id = sf.id) ON (s.field_id = sf.id)
WHERE WHERE
field_id = '".$fieldId."' AND field_id = '".$fieldId."' AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
ORDER BY s.value"; ORDER BY s.field_ value";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
@ -882,7 +882,7 @@ class ExtraFieldValue extends Model
{ {
$fieldId = (int) $fieldId; $fieldId = (int) $fieldId;
$itemId = (int) $itemId; $itemId = (int) $itemId;
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT s.* FROM {$this->table} s $sql = "SELECT s.* FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
@ -890,8 +890,8 @@ class ExtraFieldValue extends Model
WHERE WHERE
field_id = $fieldId AND field_id = $fieldId AND
item_id = $itemId AND item_id = $itemId AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
ORDER BY s.value"; ORDER BY s.field_ value";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
@ -909,16 +909,16 @@ class ExtraFieldValue extends Model
public function getAllValuesByItem($itemId) public function getAllValuesByItem($itemId)
{ {
$itemId = (int) $itemId; $itemId = (int) $itemId;
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT s.value, sf.variable, sf.field _type, sf.id, sf.display_text $sql = "SELECT s.field_value, sf.variable, sf.value _type, sf.id, sf.display_text
FROM {$this->table} s FROM {$this->table} s
INNER JOIN {$this->table_handler_field} sf INNER JOIN {$this->table_handler_field} sf
ON (s.field_id = sf.id) ON (s.field_id = sf.id)
WHERE WHERE
item_id = '$itemId' AND item_id = '$itemId' AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
ORDER BY s.value"; ORDER BY s.field_ value";
$result = Database::query($sql); $result = Database::query($sql);
$idList = []; $idList = [];
@ -928,7 +928,7 @@ class ExtraFieldValue extends Model
$repo = Container::getAssetRepository(); $repo = Container::getAssetRepository();
foreach ($result as $item) { foreach ($result as $item) {
$fieldType = (int) $item['field _type']; $fieldType = (int) $item['value _type'];
$item['url'] = ''; $item['url'] = '';
if (!empty($item['asset_id']) & & if (!empty($item['asset_id']) & &
in_array($fieldType, ExtraField::getExtraFieldTypesWithFiles(), true) in_array($fieldType, ExtraField::getExtraFieldTypesWithFiles(), true)
@ -950,7 +950,7 @@ class ExtraFieldValue extends Model
$allData = $extraField->get_all(['filter = ?' => 1]); $allData = $extraField->get_all(['filter = ?' => 1]);
$allResults = []; $allResults = [];
foreach ($allData as $field) { foreach ($allData as $field) {
$fieldType = (int) $field['field _type']; $fieldType = (int) $field['value _type'];
if (in_array($field['id'], $idList)) { if (in_array($field['id'], $idList)) {
$allResults[] = $finalResult[$field['id']]; $allResults[] = $finalResult[$field['id']];
} else { } else {
@ -976,7 +976,7 @@ class ExtraFieldValue extends Model
$allResults[] = [ $allResults[] = [
'value' => $tagResult, 'value' => $tagResult,
'variable' => $field['variable'], 'variable' => $field['variable'],
'field_type' => $field['field _type'], 'value_type' => $field['value _type'],
'id' => $field['id'], 'id' => $field['id'],
]; ];
} }
@ -997,7 +997,7 @@ class ExtraFieldValue extends Model
{ {
$fieldId = (int) $fieldId; $fieldId = (int) $fieldId;
$itemId = (int) $itemId; $itemId = (int) $itemId;
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$fieldValue = Database::escape_string($fieldValue); $fieldValue = Database::escape_string($fieldValue);
$sql = "SELECT s.* FROM {$this->table} s $sql = "SELECT s.* FROM {$this->table} s
@ -1006,9 +1006,9 @@ class ExtraFieldValue extends Model
WHERE WHERE
field_id = '$fieldId' AND field_id = '$fieldId' AND
item_id = '$itemId' AND item_id = '$itemId' AND
value = '$fieldValue' AND field_ value = '$fieldValue' AND
sf.extra_field _type = $extraFieldType sf.item _type = $extraFieldType
ORDER BY value"; ORDER BY field_ value";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
@ -1043,19 +1043,19 @@ class ExtraFieldValue extends Model
public function deleteValuesByItem($itemId) public function deleteValuesByItem($itemId)
{ {
$itemId = (int) $itemId; $itemId = (int) $itemId;
$extraFieldType = $this->getExtraField()->getExtraField Type(); $extraFieldType = $this->getExtraField()->getItem Type();
$sql = "SELECT DISTINCT fv.id, value, field _type FROM {$this->table} fv $sql = "SELECT DISTINCT fv.id, field_value, value _type FROM {$this->table} fv
INNER JOIN {$this->table_handler_field} f INNER JOIN {$this->table_handler_field} f
ON (fv.field_id = f.id) ON (fv.field_id = f.id)
WHERE extra_field _type = $extraFieldType AND item_id = $itemId"; WHERE item _type = $extraFieldType AND item_id = $itemId";
$result = Database::query($sql); $result = Database::query($sql);
$result = Database::store_result($result, 'ASSOC'); $result = Database::store_result($result, 'ASSOC');
$em = Database::getManager(); $em = Database::getManager();
$repo = Container::getAssetRepository(); $repo = Container::getAssetRepository();
foreach ($result as $item) { foreach ($result as $item) {
$fieldType = (int) $item['field _type']; $valueType = (int) $item['value _type'];
if (!empty($item['asset_id']) & & if (!empty($item['asset_id']) & &
in_array($field Type, ExtraField::getExtraFieldTypesWithFiles(), true) in_array($value Type, ExtraField::getExtraFieldTypesWithFiles(), true)
) { ) {
$asset = $repo->find($item['asset_id']); $asset = $repo->find($item['asset_id']);
if ($asset) { if ($asset) {
@ -1070,7 +1070,7 @@ class ExtraFieldValue extends Model
item_id = '$itemId' AND item_id = '$itemId' AND
field_id IN ( field_id IN (
SELECT id FROM {$this->table_handler_field} SELECT id FROM {$this->table_handler_field}
WHERE extra_field _type = $extraFieldType WHERE item _type = $extraFieldType
) )
"; ";
Database::query($sql); Database::query($sql);
@ -1095,13 +1095,13 @@ class ExtraFieldValue extends Model
WHERE WHERE
item_id = '$itemId' AND item_id = '$itemId' AND
field_id = '$fieldId' AND field_id = '$fieldId' AND
value = '$fieldValue' field_ value = '$fieldValue'
"; ";
Database::query($sql); Database::query($sql);
// Delete file from uploads. // Delete file from uploads.
if (isset($fieldData['asset_id']) & & if (isset($fieldData['asset_id']) & &
in_array($fieldData['field _type'], ExtraField::getExtraFieldTypesWithFiles()) in_array($fieldData['value _type'], ExtraField::getExtraFieldTypesWithFiles())
) { ) {
$repo = Container::getAssetRepository(); $repo = Container::getAssetRepository();
$asset = $repo->find($fieldData['asset_id']); $asset = $repo->find($fieldData['asset_id']);
@ -1136,7 +1136,7 @@ class ExtraFieldValue extends Model
$qb->expr()->eq('fv.itemId', ':item') $qb->expr()->eq('fv.itemId', ':item')
) )
->andWhere( ->andWhere(
$qb->expr()->eq('f.extraFieldType', ':extra_field _type') $qb->expr()->eq('f.itemType', ':item _type')
); );
if (is_bool($visibleToSelf)) { if (is_bool($visibleToSelf)) {
@ -1153,7 +1153,7 @@ class ExtraFieldValue extends Model
$fieldValues = $qb $fieldValues = $qb
->setParameter('item', $itemId) ->setParameter('item', $itemId)
->setParameter('extra_field_type', $this->getExtraField()->getExtraField Type()) ->setParameter('item_type', $this->getExtraField()->getItem Type())
->getQuery() ->getQuery()
->getResult(); ->getResult();
@ -1163,11 +1163,11 @@ class ExtraFieldValue extends Model
/** @var ExtraFieldValues $fieldValue */ /** @var ExtraFieldValues $fieldValue */
foreach ($fieldValues as $fieldValue) { foreach ($fieldValues as $fieldValue) {
$item = ['value' => $fieldValue]; $item = ['value' => $fieldValue];
switch ($fieldValue->getField()->getField Type()) { switch ($fieldValue->getField()->getValue Type()) {
case ExtraField::FIELD_TYPE_SELECT: case ExtraField::FIELD_TYPE_SELECT:
$item['option'] = $fieldOptionsRepo->findOneBy([ $item['option'] = $fieldOptionsRepo->findOneBy([
'field' => $fieldValue->getField(), 'field' => $fieldValue->getField(),
'value' => $fieldValue->getValue(), 'value' => $fieldValue->getField Value(),
]); ]);
break; break;
} }
christianbeeznest
3 years ago
committed by