Skip to content
Snippets Groups Projects
Commit 03ffb829 authored by Quentin Ribac's avatar Quentin Ribac Committed by Alex ORLUC
Browse files

FEAT #15527 TIME 0:15 removed useless field IndexingModelField::editable

parent e4e4f05e
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ class IndexingModelController ...@@ -73,7 +73,7 @@ class IndexingModelController
return $response->withStatus(400)->withJson(['errors' => 'Model out of perimeter']); return $response->withStatus(400)->withJson(['errors' => 'Model out of perimeter']);
} }
$fields = IndexingModelFieldModel::get(['select' => ['identifier', 'mandatory', 'default_value', 'unit', 'enabled', 'editable', 'allowed_values'], 'where' => ['model_id = ?'], 'data' => [$args['id']]]); $fields = IndexingModelFieldModel::get(['select' => ['identifier', 'mandatory', 'default_value', 'unit', 'enabled', 'allowed_values'], 'where' => ['model_id = ?'], 'data' => [$args['id']]]);
$destination = ''; $destination = '';
foreach ($fields as $key => $value) { foreach ($fields as $key => $value) {
$fields[$key]['default_value'] = json_decode($value['default_value'], true); $fields[$key]['default_value'] = json_decode($value['default_value'], true);
...@@ -252,7 +252,6 @@ class IndexingModelController ...@@ -252,7 +252,6 @@ class IndexingModelController
'enabled' => $field['enabled'] === false ? 'false' : 'true', 'enabled' => $field['enabled'] === false ? 'false' : 'true',
'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']), 'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']),
'unit' => $field['unit'], 'unit' => $field['unit'],
'editable' => $field['editable'] === true ? 'true' : 'false',
'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']), 'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']),
]); ]);
} }
...@@ -390,7 +389,6 @@ class IndexingModelController ...@@ -390,7 +389,6 @@ class IndexingModelController
'enabled' => $field['enabled'] === false ? 'false' : 'true', 'enabled' => $field['enabled'] === false ? 'false' : 'true',
'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']), 'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']),
'unit' => $field['unit'], 'unit' => $field['unit'],
'editable' => $field['editable'] === false ? 'false' : 'true',
'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']), 'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']),
]); ]);
} }
...@@ -459,7 +457,6 @@ class IndexingModelController ...@@ -459,7 +457,6 @@ class IndexingModelController
'enabled' => $field['enabled'] === false ? 'false' : 'true', 'enabled' => $field['enabled'] === false ? 'false' : 'true',
'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']), 'default_value' => !isset($field['default_value']) ? null : json_encode($field['default_value']),
'unit' => $field['unit'], 'unit' => $field['unit'],
'editable' => $field['editable'] === false ? 'false' : 'true',
'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']), 'allowed_values' => !isset($field['allowedValues']) ? null : json_encode($field['allowedValues']),
]); ]);
} }
......
...@@ -38,8 +38,8 @@ class IndexingModelFieldModel ...@@ -38,8 +38,8 @@ class IndexingModelFieldModel
public static function create(array $args) public static function create(array $args)
{ {
ValidatorModel::notEmpty($args, ['model_id', 'enabled', 'mandatory', 'identifier', 'unit', 'editable']); ValidatorModel::notEmpty($args, ['model_id', 'enabled', 'mandatory', 'identifier', 'unit']);
ValidatorModel::stringType($args, ['enabled', 'mandatory', 'identifier', 'unit', 'editable']); ValidatorModel::stringType($args, ['enabled', 'mandatory', 'identifier', 'unit']);
ValidatorModel::intVal($args, ['model_id']); ValidatorModel::intVal($args, ['model_id']);
DatabaseModel::insert([ DatabaseModel::insert([
...@@ -51,7 +51,6 @@ class IndexingModelFieldModel ...@@ -51,7 +51,6 @@ class IndexingModelFieldModel
'enabled' => $args['enabled'], 'enabled' => $args['enabled'],
'default_value' => $args['default_value'], 'default_value' => $args['default_value'],
'unit' => $args['unit'], 'unit' => $args['unit'],
'editable' => $args['editable'],
'allowed_values' => $args['allowed_values'], 'allowed_values' => $args['allowed_values'],
] ]
]); ]);
......
...@@ -374,7 +374,7 @@ class ResourceControlController ...@@ -374,7 +374,7 @@ class ResourceControlController
{ {
$body = $args['body']; $body = $args['body'];
$indexingModelFields = IndexingModelFieldModel::get(['select' => ['identifier', 'mandatory', 'editable', 'default_value', 'allowed_values'], 'where' => ['model_id = ?'], 'data' => [$body['modelId']]]); $indexingModelFields = IndexingModelFieldModel::get(['select' => ['identifier', 'mandatory', 'default_value', 'allowed_values'], 'where' => ['model_id = ?'], 'data' => [$body['modelId']]]);
foreach ($indexingModelFields as $indexingModelField) { foreach ($indexingModelFields as $indexingModelField) {
$indexingModelField['default_value'] = json_decode($indexingModelField['default_value'], true); $indexingModelField['default_value'] = json_decode($indexingModelField['default_value'], true);
$indexingModelField['allowed_values'] = json_decode($indexingModelField['allowed_values'], true); $indexingModelField['allowed_values'] = json_decode($indexingModelField['allowed_values'], true);
...@@ -420,8 +420,6 @@ class ResourceControlController ...@@ -420,8 +420,6 @@ class ResourceControlController
return ['errors' => "Body customFields[{$customFieldId}] is not a number"]; return ['errors' => "Body customFields[{$customFieldId}] is not a number"];
} elseif ($customField['type'] == 'date' && !Validator::date()->notEmpty()->validate($body['customFields'][$customFieldId])) { } elseif ($customField['type'] == 'date' && !Validator::date()->notEmpty()->validate($body['customFields'][$customFieldId])) {
return ['errors' => "Body customFields[{$customFieldId}] is not a date"]; return ['errors' => "Body customFields[{$customFieldId}] is not a date"];
} elseif (!$indexingModelField['editable'] && $body['customFields'][$customFieldId] != $indexingModelField['default_value']) {
return ['errors' => "Body {$indexingModelField['identifier']} is not editable and differs from default value ({$indexingModelField['default_value']})"];
} elseif (!empty($indexingModelField['allowed_values']) && !in_array($body['customFields'][$customFieldId], $indexingModelField['allowed_values'])) { } elseif (!empty($indexingModelField['allowed_values']) && !in_array($body['customFields'][$customFieldId], $indexingModelField['allowed_values'])) {
return ['errors' => "Body {$indexingModelField['identifier']} is not one of the allowed values"]; return ['errors' => "Body {$indexingModelField['identifier']} is not one of the allowed values"];
} }
...@@ -430,8 +428,6 @@ class ResourceControlController ...@@ -430,8 +428,6 @@ class ResourceControlController
continue; continue;
} elseif ($indexingModelField['mandatory'] && !isset($body[$indexingModelField['identifier']])) { } elseif ($indexingModelField['mandatory'] && !isset($body[$indexingModelField['identifier']])) {
return ['errors' => "Body {$indexingModelField['identifier']} is not set"]; return ['errors' => "Body {$indexingModelField['identifier']} is not set"];
} elseif (!$indexingModelField['editable'] && $body[$indexingModelField['identifier']] != $indexingModelField['default_value']) {
return ['errors' => "Body {$indexingModelField['identifier']} is not editable and defers from default value ({$indexingModelField['default_value']})"];
} elseif (!empty($indexingModelField['allowed_values']) && !in_array($body[$indexingModelField['identifier']], $indexingModelField['allowed_values'])) { } elseif (!empty($indexingModelField['allowed_values']) && !in_array($body[$indexingModelField['identifier']], $indexingModelField['allowed_values'])) {
return ['errors' => "Body {$indexingModelField['identifier']} is not one of the allowed values"]; return ['errors' => "Body {$indexingModelField['identifier']} is not one of the allowed values"];
} }
......
...@@ -997,7 +997,7 @@ export class IndexingFormComponent implements OnInit { ...@@ -997,7 +997,7 @@ export class IndexingFormComponent implements OnInit {
} }
isAlwaysDisabledField(field: any) { isAlwaysDisabledField(field: any) {
if ((this.adminMode && ((['integer', 'string', 'date'].indexOf(field.type) > -1 && !this.functions.empty(field.values)) || field.today)) || !field.editable) { if (this.adminMode && ((['integer', 'string', 'date'].indexOf(field.type) > -1 && !this.functions.empty(field.values)) || field.today)) {
return true; return true;
} }
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment