Merge branch 'develop' of https://github.com/tainacan/tainacan into develop
This commit is contained in:
commit
fdaa1a159c
|
@ -161,7 +161,13 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_REST_Controller {
|
|||
$field = $this->field_repository->fetch( $field_id );
|
||||
|
||||
$item_metadata = new Entities\Item_Metadata_Entity( $item, $field );
|
||||
if($item_metadata->is_multiple()) {
|
||||
$item_metadata->set_value( $value );
|
||||
} elseif(is_array($value)) {
|
||||
$item_metadata->set_value(implode(' ', $value));
|
||||
} else{
|
||||
$item_metadata->set_value($value);
|
||||
}
|
||||
|
||||
if ( $item_metadata->validate() ) {
|
||||
$field_updated = $this->item_metadata_repository->update( $item_metadata );
|
||||
|
|
|
@ -181,6 +181,11 @@ class Item_Metadata_Entity extends Entity {
|
|||
}
|
||||
} else {
|
||||
|
||||
if( is_array($value) ){
|
||||
$this->add_error('not_multiple', $field->get_name() . ' do not accept array as value');
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->is_collection_key()) {
|
||||
$Tainacan_Items = new \Tainacan\Repositories\Items();
|
||||
|
||||
|
@ -199,8 +204,6 @@ class Item_Metadata_Entity extends Entity {
|
|||
}
|
||||
}
|
||||
|
||||
// TODO: call fieldType validation
|
||||
//
|
||||
$this->set_as_valid();
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -88,7 +88,6 @@ $Tainacan_Fields->register_field_type('Tainacan\Field_Types\Numeric');
|
|||
$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Selectbox');
|
||||
$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Relationship');
|
||||
$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Radio');
|
||||
$Tainacan_Fields->register_field_type('Tainacan\Field_Types\Checkbox');
|
||||
|
||||
global $Tainacan_Filters;
|
||||
$Tainacan_Filters = new \Tainacan\Repositories\Filters();
|
||||
|
|
Loading…
Reference in New Issue