diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php index a7d933067..720b9e719 100644 --- a/src/admin/class-tainacan-admin.php +++ b/src/admin/class-tainacan-admin.php @@ -189,15 +189,15 @@ class Admin { 'taxonomies' => $Tainacan_Taxonomies->get_map(), ]; - $metadatum_types = $Tainacan_Metadata->fetch_metadatum_types(); + $metadata_types = $Tainacan_Metadata->fetch_metadata_types(); foreach( $maps as $type => $map ){ foreach ( $map as $metadatum => $details){ $settings['i18n']['helpers_label'][$type][$metadatum] = [ 'title' => $details['title'], 'description' => $details['description'] ]; } } - foreach ( $metadatum_types as $index => $metadatum_type){ - $class = new $metadatum_type; + foreach ( $metadata_types as $index => $metadata_type){ + $class = new $metadata_type; $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels(); } diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue index a4ab8c6f0..588998805 100644 --- a/src/admin/components/edition/metadatum-edition-form.vue +++ b/src/admin/components/edition/metadatum-edition-form.vue @@ -145,7 +145,7 @@ + v-model="editForm.metadata_type_options"/>
@@ -259,7 +259,7 @@ ]), saveEdition(metadatum) { - if ((metadatum.metadatum_type_object && metadatum.metadatum_type_object.form_component) || metadatum.edit_form == '') { + if ((metadatum.metadata_type_object && metadatum.metadata_type_object.form_component) || metadatum.edit_form == '') { this.updateMetadatum({ collectionId: this.collectionId, diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue index 42bf31630..898b26680 100644 --- a/src/admin/components/lists/filters-list.vue +++ b/src/admin/components/lists/filters-list.vue @@ -319,7 +319,7 @@ export default { for (let filter of this.filterTypes) { for (let supportedType of filter['supported_types']) { - if (choosenMetadatum.metadatum_type_object.primitive_type == supportedType) + if (choosenMetadatum.metadata_type_object.primitive_type == supportedType) this.allowedFilterTypes.push(filter); } } diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue index 0532b5849..4d7450188 100644 --- a/src/admin/components/lists/items-list.vue +++ b/src/admin/components/lists/items-list.vue @@ -59,7 +59,7 @@

@@ -120,7 +120,7 @@

@@ -162,7 +162,7 @@ + v-if="column.display && column.slug != 'thumbnail' && column.metadata_type_object != undefined && (column.metadata_type_object.related_mapped_prop != 'title')">

{{ column.name }}

{{ column.name }}
@@ -229,11 +229,11 @@ class="column-default-width" :class="{ 'thumbnail-cell': column.metadatum == 'row_thumbnail', - 'column-main-content' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.related_mapped_prop == 'title') : false, - 'column-needed-width column-align-right' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false, - 'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false, - 'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false, - 'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false, + 'column-main-content' : column.metadata_type_object != undefined ? (column.metadata_type_object.related_mapped_prop == 'title') : false, + 'column-needed-width column-align-right' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Numeric') : false, + 'column-small-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Date' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Numeric') : false, + 'column-medium-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Selectbox' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Category' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Compound') : false, + 'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Textarea') : false, }" @click="goToItemPage(item)"> diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue index 1a9fce88f..ea21e6c50 100644 --- a/src/admin/components/lists/metadata-list.vue +++ b/src/admin/components/lists/metadata-list.vue @@ -54,7 +54,7 @@ - ({{ $i18n.get(metadatum.metadatum_type_object.component) }}) {{ (metadatum.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }} + ({{ $i18n.get(metadatum.metadata_type_object.component) }}) {{ (metadatum.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }} @@ -84,8 +84,8 @@ @@ -112,7 +112,7 @@
-

{{ $i18n.get('label_available_metadatum_types') }}

+

{{ $i18n.get('label_available_metadata_types') }}

@@ -587,7 +587,7 @@ metadata.push({ name: this.$i18n.get('label_thumbnail'), metadatum: 'row_thumbnail', - metadatum_type: undefined, + metadata_type: undefined, slug: 'thumbnail', id: undefined, display: true @@ -610,8 +610,8 @@ name: metadatum.name, metadatum: metadatum.description, slug: metadatum.slug, - metadatum_type: metadatum.metadatum_type, - metadatum_type_object: metadatum.metadatum_type_object, + metadata_type: metadatum.metadata_type, + metadata_type_object: metadatum.metadata_type_object, id: metadatum.id, display: display } @@ -624,7 +624,7 @@ metadata.push({ name: this.$i18n.get('label_creation_date'), metadatum: 'row_creation', - metadatum_type: undefined, + metadata_type: undefined, slug: 'creation_date', id: undefined, display: true @@ -632,7 +632,7 @@ metadata.push({ name: this.$i18n.get('label_created_by'), metadatum: 'row_author', - metadatum_type: undefined, + metadata_type: undefined, slug: 'author_name', id: undefined, display: true diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index 079b22c9f..0350046e3 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -126,7 +126,7 @@ return apply_filters('tainacan-admin-i18n',[ 'label_items_per_page' => __( 'Items per Page:', 'tainacan' ), 'label_active_metadata' => __( 'Active Metadata', 'tainacan' ), 'label_available_metadata' => __( 'Available Metadata', 'tainacan' ), - 'label_available_metadatum_types' => __( 'Available Metadata Types', 'tainacan' ), + 'label_available_metadata_types' => __( 'Available Metadata Types', 'tainacan' ), 'label_active_filters' => __( 'Active Filters', 'tainacan' ), 'label_filter_type' => __( 'Filter Type', 'tainacan' ), 'label_available_filters' => __( 'Available Filters', 'tainacan' ), diff --git a/src/api/class-tainacan-rest-controller.php b/src/api/class-tainacan-rest-controller.php index f43cd8d9b..47f6fe24d 100644 --- a/src/api/class-tainacan-rest-controller.php +++ b/src/api/class-tainacan-rest-controller.php @@ -247,13 +247,13 @@ class REST_Controller extends \WP_REST_Controller { // handle core metadatum if( is_array($a) && array_key_exists("key", $a) ){ $metadatum = new \Tainacan\Entities\Metadatum($a['key']); - if( strpos( $metadatum->get_metadatum_type(), 'Core_Title') !== false ){ + if( strpos( $metadatum->get_metadata_type(), 'Core_Title') !== false ){ $args[ 'post_title_in' ] = [ 'relation' => ( isset( $request_meta_query['relation']) ) ? $request_meta_query['relation'] : 'AND' , 'value' => ( is_array( $a['value'] ) ) ? $a['value'] : [$a['value']] ]; continue; - } else if( strpos( $metadatum->get_metadatum_type(), 'Core_Description') !== false ) { + } else if( strpos( $metadatum->get_metadata_type(), 'Core_Description') !== false ) { $args[ 'post_content_in' ] = [ 'relation' => ( isset( $request_meta_query['relation']) ) ? $request_meta_query['relation'] : 'AND' , 'value' => ( is_array( $a['value'] ) ) ? $a['value'] : [$a['value']] diff --git a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php index eb6b8eb75..8a8d30c01 100644 --- a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php +++ b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php @@ -121,7 +121,7 @@ class REST_Item_Metadata_Controller extends REST_Controller { foreach ($items_metadata as $item_metadata){ $index = array_push($prepared_item, $this->prepare_item_for_response($item_metadata, $request)); - $prepared_item[$index-1]['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response( $item_metadata->get_metadatum()->get_metadatum_type_object(), $request); + $prepared_item[$index-1]['metadatum']['metadata_type_object'] = $this->prepare_item_for_response( $item_metadata->get_metadatum()->get_metadata_type_object(), $request); } return new \WP_REST_Response(apply_filters('tainacan-rest-response', $prepared_item, $request), 200); @@ -146,7 +146,7 @@ class REST_Item_Metadata_Controller extends REST_Controller { $metadatum = $item_metadata->get_metadatum(); if($metadatum->get_id() == $metadatum_id) { $prepared_item = $this->prepare_item_for_response($item_metadata, $request); - $prepared_item['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response( $metadatum->get_metadatum_type_object(), $request); + $prepared_item['metadatum']['metadata_type_object'] = $this->prepare_item_for_response( $metadatum->get_metadata_type_object(), $request); } } @@ -205,7 +205,7 @@ class REST_Item_Metadata_Controller extends REST_Controller { $metadatum_updated = $this->item_metadata_repository->update( $item_metadata ); $prepared_item = $this->prepare_item_for_response($metadatum_updated, $request); - $prepared_item['metadatum']['metadatum_type_object'] = $this->prepare_item_for_response($metadatum_updated->get_metadatum()->get_metadatum_type_object(), $request); + $prepared_item['metadatum']['metadata_type_object'] = $this->prepare_item_for_response($metadatum_updated->get_metadatum()->get_metadata_type_object(), $request); } elseif($metadatum->get_accept_suggestion()) { $log = $this->item_metadata_repository->suggest( $item_metadata ); diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php index 0ee284f54..c482cae09 100644 --- a/src/api/endpoints/class-tainacan-rest-items-controller.php +++ b/src/api/endpoints/class-tainacan-rest-items-controller.php @@ -117,7 +117,7 @@ class REST_Items_Controller extends REST_Controller { $item_metadata_array = $me->_toArray(); $item_array['metadata'][ $slug ]['name'] = $metadatum->get_name(); - if($metadatum->get_metadatum_type_object()->get_primitive_type() === 'date') { + if($metadatum->get_metadata_type_object()->get_primitive_type() === 'date') { $item_array['metadata'][ $slug ]['date_i18n'] = $item_metadata_array['date_i18n']; } else { $item_array['metadata'][ $slug ]['value'] = $item_metadata_array['value']; diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php index c4e28715d..96909cfc4 100644 --- a/src/api/endpoints/class-tainacan-rest-metadata-controller.php +++ b/src/api/endpoints/class-tainacan-rest-metadata-controller.php @@ -297,12 +297,12 @@ class REST_Metadata_Controller extends REST_Controller { if(!empty($item)){ $item_arr = $item->_toArray(); - $item_arr['metadatum_type_object'] = $item->get_metadatum_type_object()->_toArray(); + $item_arr['metadata_type_object'] = $item->get_metadata_type_object()->_toArray(); if($request['context'] === 'edit'){ $item_arr['current_user_can_edit'] = $item->can_edit(); ob_start(); - $item->get_metadatum_type_object()->form(); + $item->get_metadata_type_object()->form(); $form = ob_get_clean(); $item_arr['edit_form'] = $form; $item_arr['enabled'] = $item->get_enabled_for_collection(); diff --git a/src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-types-controller.php similarity index 81% rename from src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php rename to src/api/endpoints/class-tainacan-rest-metadata-types-controller.php index bb99f7e55..a5624371e 100644 --- a/src/api/endpoints/class-tainacan-rest-metadatum-types-controller.php +++ b/src/api/endpoints/class-tainacan-rest-metadata-types-controller.php @@ -4,13 +4,13 @@ namespace Tainacan\API\EndPoints; use \Tainacan\API\REST_Controller; -class REST_Metadatum_Types_Controller extends REST_Controller { +class REST_Metadata_Types_Controller extends REST_Controller { /** - * REST_Metadatum_Types_Controller constructor. + * REST_Metadata_Types_Controller constructor. */ public function __construct() { - $this->rest_base = 'metadatum-types'; + $this->rest_base = 'metadata-types'; parent::__construct(); } @@ -22,7 +22,7 @@ class REST_Metadatum_Types_Controller extends REST_Controller { 'callback' => array($this, 'get_items'), 'permission_callback' => array($this, 'get_items_permissions_check'), 'args' => [ - 'metadatum-type' => [ + 'metadata-type' => [ 'description' => __('The structure of objects returned.'), 'items' => [ 'errors' => [ @@ -67,10 +67,10 @@ class REST_Metadatum_Types_Controller extends REST_Controller { * @return mixed|\WP_Error|\WP_REST_Response */ public function prepare_item_for_response( $item, $request ) { - $name = "\Tainacan\Metadatum_Types\\$item"; - $metadatum_type = new $name(); + $name = "\Tainacan\Metadata_Types\\$item"; + $metadata_type = new $name(); - $metadatum_arr = $metadatum_type->_toArray(); + $metadatum_arr = $metadata_type->_toArray(); $metadatum_arr['name'] = $item; return $metadatum_arr; @@ -84,11 +84,11 @@ class REST_Metadatum_Types_Controller extends REST_Controller { public function get_items( $request ) { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); - $metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME'); + $metadata_types = $Tainacan_Metadata->fetch_metadata_types('NAME'); $prepared = []; - foreach ($metadatum_types as $metadatum_type){ - array_push($prepared, $this->prepare_item_for_response($metadatum_type, $request)); + foreach ($metadata_types as $metadata_type){ + array_push($prepared, $this->prepare_item_for_response($metadata_type, $request)); } return new \WP_REST_Response($prepared, 200); diff --git a/src/api/tainacan-rest-creator.php b/src/api/tainacan-rest-creator.php index 42dbf4725..df9b8702f 100644 --- a/src/api/tainacan-rest-creator.php +++ b/src/api/tainacan-rest-creator.php @@ -11,7 +11,7 @@ $rest_terms_controller = new \Tainacan\API\EndPoints\REST_Terms_Contro $rest_filters_controller = new \Tainacan\API\EndPoints\REST_Filters_Controller(); $rest_item_metadata_controller = new \Tainacan\API\EndPoints\REST_Item_Metadata_Controller(); $rest_logs_controller = new \Tainacan\API\EndPoints\REST_Logs_Controller(); -$rest_metadatum_types_controller = new \Tainacan\API\EndPoints\REST_Metadatum_Types_Controller(); +$rest_metadata_types_controller = new \Tainacan\API\EndPoints\REST_Metadata_Types_Controller(); $rest_filter_types_controller = new \Tainacan\API\EndPoints\REST_Filter_Types_Controller(); new \Tainacan\API\EndPoints\REST_Export_Controller(); new \Tainacan\API\EndPoints\REST_Metadatum_Mappers_Controller(); diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php index fe1d97d68..a4f2ec864 100644 --- a/src/classes/entities/class-tainacan-collection.php +++ b/src/classes/entities/class-tainacan-collection.php @@ -465,8 +465,8 @@ class Collection extends Entity { return $repo->fetch_by_collection($this, [ 'meta_query' => [ [ - 'key' => 'metadatum_type', - 'value' => ['Tainacan\Metadatum_Types\Core_Title', 'Tainacan\Metadatum_Types\Core_Description'], + 'key' => 'metadata_type', + 'value' => ['Tainacan\Metadata_Types\Core_Title', 'Tainacan\Metadata_Types\Core_Description'], 'compare' => 'IN' ] ] @@ -484,8 +484,8 @@ class Collection extends Entity { $results = $repo->fetch_by_collection($this, [ 'meta_query' => [ [ - 'key' => 'metadatum_type', - 'value' => 'Tainacan\Metadatum_Types\Core_Title', + 'key' => 'metadata_type', + 'value' => 'Tainacan\Metadata_Types\Core_Title', ] ], 'posts_per_page' => 1 @@ -508,8 +508,8 @@ class Collection extends Entity { $results = $repo->fetch_by_collection($this, [ 'meta_query' => [ [ - 'key' => 'metadatum_type', - 'value' => 'Tainacan\Metadatum_Types\Core_Description', + 'key' => 'metadata_type', + 'value' => 'Tainacan\Metadata_Types\Core_Description', ] ], 'posts_per_page' => 1 diff --git a/src/classes/entities/class-tainacan-item-metadata-entity.php b/src/classes/entities/class-tainacan-item-metadata-entity.php index bef495fc6..a0585f67f 100644 --- a/src/classes/entities/class-tainacan-item-metadata-entity.php +++ b/src/classes/entities/class-tainacan-item-metadata-entity.php @@ -54,7 +54,7 @@ class Item_Metadata_Entity extends Entity { $metadatum = $this->get_metadatum(); if (is_object($metadatum)) { - $fto = $metadatum->get_metadatum_type_object(); + $fto = $metadatum->get_metadata_type_object(); if (is_object($fto)) { if ( method_exists($fto, 'get_value_as_html') ) { @@ -143,7 +143,7 @@ class Item_Metadata_Entity extends Entity { $as_array['value_as_html'] = $this->get_value_as_html(); $as_array['value_as_string'] = $this->get_value_as_string(); - if($this->get_metadatum()->get_metadatum_type_object()->get_primitive_type() === 'date'){ + if($this->get_metadatum()->get_metadata_type_object()->get_primitive_type() === 'date'){ $as_array['date_i18n'] = $this->get_date_i18n($this->get_value_as_string()); } @@ -321,11 +321,11 @@ class Item_Metadata_Entity extends Entity { return false; } - $classMetadatumType = $metadatum->get_metadatum_type_object(); + $classMetadatumType = $metadatum->get_metadata_type_object(); if( is_object( $classMetadatumType ) ){ if( method_exists ( $classMetadatumType , 'validate' ) ){ if( ! $classMetadatumType->validate( $this ) ) { - $this->add_error('metadatum_type_error', $classMetadatumType->get_errors() ); + $this->add_error('metadata_type_error', $classMetadatumType->get_errors() ); return false; } } diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index a9b97253f..684f8d602 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -385,7 +385,7 @@ class Item extends Entity { foreach ( $arrayItemMetadata as $itemMetadata ) { // skip validation for Compound Metadata - if ( $itemMetadata->get_metadatum()->get_metadatum_type() == 'Tainacan\Metadatum_Types\Compound' ) { + if ( $itemMetadata->get_metadatum()->get_metadata_type() == 'Tainacan\Metadata_Types\Compound' ) { continue; } @@ -582,7 +582,7 @@ class Item extends Entity { foreach ( $metadata as $item_meta ) { - $fto = $item_meta->get_metadatum()->get_metadatum_type_object(); + $fto = $item_meta->get_metadatum()->get_metadata_type_object(); if ( $fto->get_core() ) { if ( $args['exclude_core'] ) { diff --git a/src/classes/entities/class-tainacan-metadatum.php b/src/classes/entities/class-tainacan-metadatum.php index 395dafdb6..e293a89ab 100644 --- a/src/classes/entities/class-tainacan-metadatum.php +++ b/src/classes/entities/class-tainacan-metadatum.php @@ -21,8 +21,8 @@ class Metadatum extends Entity { $collection_key, $mask, $default_value, - $metadatum_type, - $metadatum_type_options; + $metadata_type, + $metadata_type_options; // Collection getter and setter declared here use \Tainacan\Traits\Entity_Collection_Relation; @@ -166,14 +166,14 @@ class Metadatum extends Entity { } /** - * Return the an object child of \Tainacan\metadatum_Types\Metadatum_Type with options + * Return the an object child of \Tainacan\metadatum_Types\Metadata_Type with options * - * @return \Tainacan\Metadatum_Types\Metadatum_Type The metadatum type class with filled options + * @return \Tainacan\Metadata_Types\Metadata_Type The metadatum type class with filled options */ - function get_metadatum_type_object(){ - $class_name = $this->get_metadatum_type(); + function get_metadata_type_object(){ + $class_name = $this->get_metadata_type(); $object_type = new $class_name(); - $object_type->set_options( $this->get_metadatum_type_options() ); + $object_type->set_options( $this->get_metadata_type_options() ); return $object_type; } @@ -182,8 +182,8 @@ class Metadatum extends Entity { * * @return string The */ - function get_metadatum_type(){ - return $this->get_mapped_property('metadatum_type'); + function get_metadata_type(){ + return $this->get_mapped_property('metadata_type'); } /** @@ -191,8 +191,8 @@ class Metadatum extends Entity { * * @return array Configurations for the metadatum type object */ - function get_metadatum_type_options(){ - return $this->get_mapped_property('metadatum_type_options'); + function get_metadata_type_options(){ + return $this->get_mapped_property('metadata_type_options'); } /** @@ -330,10 +330,10 @@ class Metadatum extends Entity { /** * set the metadatum type class name * - * @param string | \Tainacan\Metadatum_Types\Metadatum_Type $value The name of the class or the instance + * @param string | \Tainacan\Metadata_Types\Metadata_Type $value The name of the class or the instance */ - public function set_metadatum_type( $value ){ - $this->set_mapped_property('metadatum_type', ( is_object( $value ) ) ? get_class( $value ) : $value ) ; // Encode to avoid backslaches removal + public function set_metadata_type( $value ){ + $this->set_mapped_property('metadata_type', ( is_object( $value ) ) ? get_class( $value ) : $value ) ; // Encode to avoid backslaches removal } /** @@ -350,8 +350,8 @@ class Metadatum extends Entity { * @param [string || integer] $value * @return void */ - function set_metadatum_type_options( $value ){ - $this->set_mapped_property('metadatum_type_options', $value); + function set_metadata_type_options( $value ){ + $this->set_mapped_property('metadata_type_options', $value); } /** @@ -423,26 +423,26 @@ class Metadatum extends Entity { // You cant have a multiple metadatum inside a compound metadatum (except category) if ($this->get_parent() > 0) { - if ( $this->is_multiple() && $this->get_metadatum_type_object()->get_primitive_type() != 'term') { + if ( $this->is_multiple() && $this->get_metadata_type_object()->get_primitive_type() != 'term') { $this->add_error($this->get_id(), __('Compound metadata do not support metadata with multiple values (except categories)', 'tainacan')); return false; } } // You cant have a category metadatum inside a multiple compound metadatum - if ( $this->get_parent() > 0 && $this->get_metadatum_type_object()->get_primitive_type() == 'term' ) { + if ( $this->get_parent() > 0 && $this->get_metadata_type_object()->get_primitive_type() == 'term' ) { $parent_metadatum = new \Tainacan\Entities\Metadatum($this->get_parent()); if ( $parent_metadatum->is_multiple() ) { $this->add_error($this->get_id(), __('Taxonomy metadata can not be used inside Compound metadata with multiple values', 'tainacan')); return false; } } - if ( $this->get_metadatum_type() == 'Tainacan\Metadatum_Types\Compound' && $this->is_multiple() ) { + if ( $this->get_metadata_type() == 'Tainacan\Metadata_Types\Compound' && $this->is_multiple() ) { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $children = $Tainacan_Metadata->fetch( [ 'parent' => $this->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Category', + 'metadata_type' => 'Tainacan\Metadata_Types\Category', 'post_status' => 'any' ] , 'OBJECT'); @@ -453,7 +453,7 @@ class Metadatum extends Entity { } } - $fto = $this->get_metadatum_type_object(); + $fto = $this->get_metadata_type_object(); if (is_object($fto)) { $is_valid = $fto->validate_options($this); @@ -469,7 +469,7 @@ class Metadatum extends Entity { throw new \Exception( "Return of validate_options metadatum type method should be an Array in case of error" ); } - $this->add_error('metadatum_type_options', $is_valid); + $this->add_error('metadata_type_options', $is_valid); return false; diff --git a/src/classes/filter-types/autocomplete/Autocomplete.vue b/src/classes/filter-types/autocomplete/Autocomplete.vue index 6a1c8666d..3a9f83a51 100644 --- a/src/classes/filter-types/autocomplete/Autocomplete.vue +++ b/src/classes/filter-types/autocomplete/Autocomplete.vue @@ -60,9 +60,9 @@ axios.get(in_route) .then( res => { let result = res.data; - if( result && result.metadatum_type ){ + if( result && result.metadata_type ){ vm.metadatum_object = result; - vm.type = result.metadatum_type; + vm.type = result.metadata_type; vm.selectedValues(); } }) @@ -105,9 +105,9 @@ search( query ){ let promise = null; this.options = []; - if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) { - let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ? - this.metadatum_object.metadatum_type_options.collection_id : this.collection_id; + if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) { + let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ? + this.metadatum_object.metadata_type_options.collection_id : this.collection_id; promise = this.getValuesRelationship( collectionTarget ); } else { @@ -129,11 +129,11 @@ let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum ); if ( index >= 0){ let metadata = this.query.metaquery[ index ]; - let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ? - this.metadatum_object.metadatum_type_options.collection_id : this.collection_id; + let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ? + this.metadatum_object.metadata_type_options.collection_id : this.collection_id; - if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) { + if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) { let query = qs.stringify({ postin: metadata.value }); axios.get('/collection/' + collectionTarget + '/items?' + query) diff --git a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php index d4d266abe..60ced30b3 100644 --- a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php +++ b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php @@ -21,7 +21,7 @@ class Autocomplete extends Filter_Type { public function render( $filter ){ return ''; } } \ No newline at end of file diff --git a/src/classes/filter-types/category/Checkbox.vue b/src/classes/filter-types/category/Checkbox.vue index 4f0d0984a..5e0f7d6eb 100644 --- a/src/classes/filter-types/category/Checkbox.vue +++ b/src/classes/filter-types/category/Checkbox.vue @@ -21,7 +21,7 @@ created(){ this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id; this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ; - this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type; + this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type; this.loadOptions(); }, data(){ @@ -72,7 +72,7 @@ axios.get('/collection/'+ this.collection +'/metadata/' + this.metadatum) .then( res => { let metadatum = res.data; - promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id ); + promise = this.getValuesCategory( metadatum.metadata_type_options.taxonomy_id ); promise.then( () => { this.isLoading = false; diff --git a/src/classes/filter-types/category/Selectbox.vue b/src/classes/filter-types/category/Selectbox.vue index ec525de86..713cd7d1a 100644 --- a/src/classes/filter-types/category/Selectbox.vue +++ b/src/classes/filter-types/category/Selectbox.vue @@ -24,7 +24,7 @@ created(){ this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id; this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ; - this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type; + this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type; this.loadOptions(); }, data(){ @@ -74,7 +74,7 @@ axios.get('/collection/'+ this.collection +'/metadata/' + this.metadatum) .then( res => { let metadatum = res.data; - promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id ); + promise = this.getValuesCategory( metadatum.metadata_type_options.taxonomy_id ); promise.then( () => { this.isLoading = false; diff --git a/src/classes/filter-types/category/Taginput.vue b/src/classes/filter-types/category/Taginput.vue index 9f72b5194..87b68329a 100644 --- a/src/classes/filter-types/category/Taginput.vue +++ b/src/classes/filter-types/category/Taginput.vue @@ -20,7 +20,7 @@ created(){ this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id; this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ; - this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadatum_type; + this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type; let in_route = '/collection/' + this.collection + '/metadata/' + this.metadatum; @@ -31,7 +31,7 @@ axios.get(in_route) .then( res => { let metadatum = res.data; - this.selectedValues( metadatum.metadatum_type_options.taxonomy_id ); + this.selectedValues( metadatum.metadata_type_options.taxonomy_id ); }); }, data(){ @@ -88,7 +88,7 @@ axios.get(endpoint) .then( res => { let metadatum = res.data; - promise = this.getValuesCategory( metadatum.metadatum_type_options.taxonomy_id, q ); + promise = this.getValuesCategory( metadatum.metadata_type_options.taxonomy_id, q ); this.isLoading = true; promise.then( () => { this.isLoading = false; diff --git a/src/classes/filter-types/category/class-tainacan-categorycheckbox.php b/src/classes/filter-types/category/class-tainacan-categorycheckbox.php index 35db27482..d44a7214d 100644 --- a/src/classes/filter-types/category/class-tainacan-categorycheckbox.php +++ b/src/classes/filter-types/category/class-tainacan-categorycheckbox.php @@ -20,7 +20,7 @@ class CategoryCheckbox extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/filter-types/category/class-tainacan-categoryselectbox.php b/src/classes/filter-types/category/class-tainacan-categoryselectbox.php index faba2d206..01de2b5d1 100644 --- a/src/classes/filter-types/category/class-tainacan-categoryselectbox.php +++ b/src/classes/filter-types/category/class-tainacan-categoryselectbox.php @@ -20,7 +20,7 @@ class CategorySelectbox extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/filter-types/category/class-tainacan-categorytaginput.php b/src/classes/filter-types/category/class-tainacan-categorytaginput.php index b5a63999d..2ed8778a7 100644 --- a/src/classes/filter-types/category/class-tainacan-categorytaginput.php +++ b/src/classes/filter-types/category/class-tainacan-categorytaginput.php @@ -20,7 +20,7 @@ class CategoryTaginput extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue index f82bffc77..0d365d24d 100644 --- a/src/classes/filter-types/checkbox/Checkbox.vue +++ b/src/classes/filter-types/checkbox/Checkbox.vue @@ -31,9 +31,9 @@ axios.get(in_route) .then( res => { let result = res.data; - if( result && result.metadatum_type ){ + if( result && result.metadata_type ){ vm.metadatum_object = result; - vm.type = result.metadatum_type; + vm.type = result.metadata_type; vm.loadOptions(); } }) @@ -67,9 +67,9 @@ let promise = null; this.isLoading = true; - if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) { - let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ? - this.metadatum_object.metadatum_type_options.collection_id : this.collection_id; + if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) { + let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ? + this.metadatum_object.metadata_type_options.collection_id : this.collection_id; promise = this.getValuesRelationship( collectionTarget ); } else { diff --git a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php index 3fb34cb06..61c79bdf3 100644 --- a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php +++ b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php @@ -20,7 +20,7 @@ class Checkbox extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue index 3b79bbb13..fecf1a564 100644 --- a/src/classes/filter-types/custom-interval/CustomInterval.vue +++ b/src/classes/filter-types/custom-interval/CustomInterval.vue @@ -75,9 +75,9 @@ axios.get(in_route) .then( res => { let result = res.data; - if( result && result.metadatum_type ){ + if( result && result.metadata_type ){ vm.metadatum_object = result; - vm.type = ( result.metadatum_type === 'Tainacan\\Metadatum_Types\\Date') ? 'date' : 'numeric'; + vm.type = ( result.metadata_type === 'Tainacan\\Metadata_Types\\Date') ? 'date' : 'numeric'; vm.selectedValues(); } }) diff --git a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php index 44b2d151c..09b2a6944 100644 --- a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php +++ b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php @@ -20,7 +20,7 @@ class Custom_Interval extends Filter_Type { * @internal param $metadatum */ public function render( $filter ){ - $type = ( $filter->get_metadatum()->get_metadatum_type() === 'Tainacan\Metadatum_Types\Date' ) ? 'date' : 'numeric'; + $type = ( $filter->get_metadatum()->get_metadata_type() === 'Tainacan\Metadata_Types\Date' ) ? 'date' : 'numeric'; return 'get_metadatum()->get_metadatum_type(); + $metadata_type = $filter->get_metadatum()->get_metadata_type(); //if there is no metadatum to validate - if( !$metadatum_type ){ + if( !$metadata_type ){ return true; } - $class = ( is_object( $metadatum_type ) ) ? $metadatum_type : new $metadatum_type(); + $class = ( is_object( $metadata_type ) ) ? $metadata_type : new $metadata_type(); if(in_array( $class->get_primitive_type(), $this->supported_types )){ return true; diff --git a/src/classes/filter-types/selectbox/Selectbox.vue b/src/classes/filter-types/selectbox/Selectbox.vue index 5fe68524b..a724ad73d 100644 --- a/src/classes/filter-types/selectbox/Selectbox.vue +++ b/src/classes/filter-types/selectbox/Selectbox.vue @@ -37,9 +37,9 @@ axios.get(in_route) .then( res => { let result = res.data; - if( result && result.metadatum_type ){ + if( result && result.metadata_type ){ vm.metadatum_object = result; - vm.type = result.metadatum_type; + vm.type = result.metadata_type; vm.loadOptions(); } }) diff --git a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php index b96f1670b..e9a24db88 100644 --- a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php +++ b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php @@ -20,7 +20,7 @@ class Selectbox extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/filter-types/taginput/Taginput.vue b/src/classes/filter-types/taginput/Taginput.vue index c9e810950..8bf5dfd6f 100644 --- a/src/classes/filter-types/taginput/Taginput.vue +++ b/src/classes/filter-types/taginput/Taginput.vue @@ -33,9 +33,9 @@ axios.get(in_route) .then( res => { let result = res.data; - if( result && result.metadatum_type ){ + if( result && result.metadata_type ){ vm.metadatum_object = result; - vm.type = result.metadatum_type; + vm.type = result.metadata_type; vm.selectedValues(); } }) @@ -81,9 +81,9 @@ search( query ){ let promise = null; this.options = []; - if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) { - let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ? - this.metadatum_object.metadatum_type_options.collection_id : this.collection_id; + if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) { + let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ? + this.metadatum_object.metadata_type_options.collection_id : this.collection_id; promise = this.getValuesRelationship( collectionTarget, query ); } else { @@ -105,11 +105,11 @@ let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum ); if ( index >= 0){ let metadata = this.query.metaquery[ index ]; - let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadatum_type_options.collection_id ) ? - this.metadatum_object.metadatum_type_options.collection_id : this.collection_id; + let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ? + this.metadatum_object.metadata_type_options.collection_id : this.collection_id; - if ( this.type === 'Tainacan\\Metadatum_Types\\Relationship' ) { + if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) { let query = qs.stringify({ postin: metadata.value }); axios.get('/collection/' + collectionTarget + '/items?' + query) diff --git a/src/classes/filter-types/taginput/class-tainacan-taginput.php b/src/classes/filter-types/taginput/class-tainacan-taginput.php index 354fbdcc0..2b13bdc73 100644 --- a/src/classes/filter-types/taginput/class-tainacan-taginput.php +++ b/src/classes/filter-types/taginput/class-tainacan-taginput.php @@ -20,7 +20,7 @@ class Taginput extends Filter_Type { public function render( $filter ){ return ''; } diff --git a/src/classes/metadatum-types/category/AddNewTerm.vue b/src/classes/metadata-types/category/AddNewTerm.vue similarity index 100% rename from src/classes/metadatum-types/category/AddNewTerm.vue rename to src/classes/metadata-types/category/AddNewTerm.vue diff --git a/src/classes/metadatum-types/category/Category.vue b/src/classes/metadata-types/category/Category.vue similarity index 85% rename from src/classes/metadatum-types/category/Category.vue rename to src/classes/metadata-types/category/Category.vue index f0b8ef293..7b990f9c0 100644 --- a/src/classes/metadatum-types/category/Category.vue +++ b/src/classes/metadata-types/category/Category.vue @@ -27,15 +27,15 @@ export default { created(){ - let metadatum_type_options = this.metadatum.metadatum.metadatum_type_options; - this.component = ( metadatum_type_options && metadatum_type_options.input_type ) - ? this.metadatum.metadatum.metadatum_type_options.input_type : this.componentAttribute + let metadata_type_options = this.metadatum.metadatum.metadata_type_options; + this.component = ( metadata_type_options && metadata_type_options.input_type ) + ? this.metadatum.metadatum.metadata_type_options.input_type : this.componentAttribute this.collectionId = this.metadatum.metadatum.collection_id; - this.taxonomy = metadatum_type_options.taxonomy_id; + this.taxonomy = metadata_type_options.taxonomy_id; - if( metadatum_type_options && metadatum_type_options.allow_new_terms ){ - this.allowNew = metadatum_type_options.allow_new_terms === 'yes' + if( metadata_type_options && metadata_type_options.allow_new_terms ){ + this.allowNew = metadata_type_options.allow_new_terms === 'yes' } this.getTermsFromTaxonomy(); this.getTermsId(); @@ -77,8 +77,8 @@ methods: { getComponent(){ if( this.metadatum.metadatum - && this.metadatum.metadatum.metadatum_type_options && this.metadatum.metadatum.metadatum_type_options.input_type ){ - return this.metadatum.metadatum.metadatum_type_options.input_type; + && this.metadatum.metadatum.metadata_type_options && this.metadatum.metadatum.metadata_type_options.input_type ){ + return this.metadatum.metadatum.metadata_type_options.input_type; } }, getTermsFromTaxonomy(){ diff --git a/src/classes/metadatum-types/category/CategoryCheckbox.vue b/src/classes/metadata-types/category/CategoryCheckbox.vue similarity index 100% rename from src/classes/metadatum-types/category/CategoryCheckbox.vue rename to src/classes/metadata-types/category/CategoryCheckbox.vue diff --git a/src/classes/metadatum-types/category/CategoryRadio.vue b/src/classes/metadata-types/category/CategoryRadio.vue similarity index 100% rename from src/classes/metadatum-types/category/CategoryRadio.vue rename to src/classes/metadata-types/category/CategoryRadio.vue diff --git a/src/classes/metadatum-types/category/CategorySelectbox.vue b/src/classes/metadata-types/category/CategorySelectbox.vue similarity index 100% rename from src/classes/metadatum-types/category/CategorySelectbox.vue rename to src/classes/metadata-types/category/CategorySelectbox.vue diff --git a/src/classes/metadatum-types/category/CategoryTaginput.vue b/src/classes/metadata-types/category/CategoryTaginput.vue similarity index 100% rename from src/classes/metadatum-types/category/CategoryTaginput.vue rename to src/classes/metadata-types/category/CategoryTaginput.vue diff --git a/src/classes/metadatum-types/category/FormCategory.vue b/src/classes/metadata-types/category/FormCategory.vue similarity index 98% rename from src/classes/metadatum-types/category/FormCategory.vue rename to src/classes/metadata-types/category/FormCategory.vue index 17e8794c4..ae1c2ebfc 100644 --- a/src/classes/metadatum-types/category/FormCategory.vue +++ b/src/classes/metadata-types/category/FormCategory.vue @@ -38,7 +38,7 @@ @@ -51,7 +51,7 @@ fetch([ 'collection_id' => $metadatum->get_collection_id(), - 'metadatum_type' => 'Tainacan\\Metadatum_Types\\Category' + 'metadata_type' => 'Tainacan\\Metadata_Types\\Category' ], 'OBJECT'); $category_metadata = array_map(function ($metadatum_map) { - $fto = $metadatum_map->get_metadatum_type_object(); + $fto = $metadatum_map->get_metadata_type_object(); return [ $metadatum_map->get_id() => $fto->get_option('taxonomy_id') ]; }, $category_metadata); diff --git a/src/classes/metadatum-types/compound/class-tainacan-compound.php b/src/classes/metadata-types/compound/class-tainacan-compound.php similarity index 97% rename from src/classes/metadatum-types/compound/class-tainacan-compound.php rename to src/classes/metadata-types/compound/class-tainacan-compound.php index ac8882155..66a18f54c 100644 --- a/src/classes/metadatum-types/compound/class-tainacan-compound.php +++ b/src/classes/metadata-types/compound/class-tainacan-compound.php @@ -1,6 +1,6 @@ {{ option.name }} @@ -183,7 +183,7 @@ this.metadata = []; for( let metadatum of metadata ){ - if( metadatum.metadatum_type !== "Tainacan\\Metadatum_Types\\Relationship"){ + if( metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Relationship"){ this.metadata.push( metadatum ); this.hasMetadata = true; this.checkMetadata() diff --git a/src/classes/metadatum-types/relationship/Relationship.vue b/src/classes/metadata-types/relationship/Relationship.vue similarity index 90% rename from src/classes/metadatum-types/relationship/Relationship.vue rename to src/classes/metadata-types/relationship/Relationship.vue index 8a6e2cfd2..fa3d2b0a1 100644 --- a/src/classes/metadatum-types/relationship/Relationship.vue +++ b/src/classes/metadata-types/relationship/Relationship.vue @@ -21,7 +21,7 @@ export default { created(){ - let collectionId = ( this.metadatum && this.metadatum.metadatum.metadatum_type_options.collection_id ) ? this.metadatum.metadatum.metadatum_type_options.collection_id : this.collection_id; + let collectionId = ( this.metadatum && this.metadatum.metadatum.metadata_type_options.collection_id ) ? this.metadatum.metadatum.metadata_type_options.collection_id : this.collection_id; if( this.metadatum.value ){ let query = qs.stringify({ postin: ( Array.isArray( this.metadatum.value ) ) ? this.metadatum.value : [ this.metadatum.value ] }); @@ -36,12 +36,12 @@ }); } - if( this.metadatum.metadatum.metadatum_type_options - && this.metadatum.metadatum.metadatum_type_options.search.length > 0){ + if( this.metadatum.metadatum.metadata_type_options + && this.metadatum.metadatum.metadata_type_options.search.length > 0){ axios.get('/collection/'+ collectionId +'/metadata?context=edit') .then( res => { for (let item of res.data) { - if( this.metadatum.metadatum.metadatum_type_options.search.indexOf( item.id ) >= 0 ) + if( this.metadatum.metadatum.metadata_type_options.search.indexOf( item.id ) >= 0 ) this.searchMetadata.push( item ); } }) @@ -103,7 +103,7 @@ let metaquery = this.mountQuery( query ); this.loading = true; this.options = []; - let collectionId = ( this.metadatum && this.metadatum.metadatum.metadatum_type_options.collection_id ) ? this.metadatum.metadatum.metadatum_type_options.collection_id : this.collection_id; + let collectionId = ( this.metadatum && this.metadatum.metadatum.metadata_type_options.collection_id ) ? this.metadatum.metadatum.metadata_type_options.collection_id : this.collection_id; axios.get('/collection/'+collectionId+'/items?' + qs.stringify( metaquery )) .then( res => { this.loading = false; diff --git a/src/classes/metadatum-types/relationship/class-tainacan-relationship.php b/src/classes/metadata-types/relationship/class-tainacan-relationship.php similarity index 97% rename from src/classes/metadatum-types/relationship/class-tainacan-relationship.php rename to src/classes/metadata-types/relationship/class-tainacan-relationship.php index d4b6b8423..62adcbf40 100644 --- a/src/classes/metadatum-types/relationship/class-tainacan-relationship.php +++ b/src/classes/metadata-types/relationship/class-tainacan-relationship.php @@ -1,13 +1,13 @@ * - ({{ $i18n.get(metadatum.metadatum.metadatum_type_object.component) }}) + ({{ $i18n.get(metadatum.metadatum.metadata_type_object.component) }})
+ v-if="isTextInputComponent( metadatum.metadatum.metadata_type_object.component )"> @@ -35,8 +35,8 @@ :key="index" class="multiple-inputs"> @@ -156,7 +156,7 @@ margin-left: 18px; margin-bottom: 0.5em; } - .metadatum-type { + .metadata-type { font-size: 13px; font-weight: 400; color: $gray; diff --git a/src/classes/metadatum-types/text/Text.vue b/src/classes/metadata-types/text/Text.vue similarity index 100% rename from src/classes/metadatum-types/text/Text.vue rename to src/classes/metadata-types/text/Text.vue diff --git a/src/classes/metadatum-types/text/class-tainacan-text.php b/src/classes/metadata-types/text/class-tainacan-text.php similarity index 92% rename from src/classes/metadatum-types/text/class-tainacan-text.php rename to src/classes/metadata-types/text/class-tainacan-text.php index cee0f0c4b..78fc0513b 100644 --- a/src/classes/metadatum-types/text/class-tainacan-text.php +++ b/src/classes/metadata-types/text/class-tainacan-text.php @@ -1,13 +1,13 @@ is_multiple(); - $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object(); - if ($metadatum_type->get_core()) { + $metadata_type = $item_metadata->get_metadatum()->get_metadata_type_object(); + if ($metadata_type->get_core()) { $this->save_core_metadatum_value($item_metadata); - } elseif ($metadatum_type->get_primitive_type() == 'term') { + } elseif ($metadata_type->get_primitive_type() == 'term') { $this->save_terms_metadatum_value($item_metadata); - } elseif ($metadatum_type->get_primitive_type() == 'compound') { + } elseif ($metadata_type->get_primitive_type() == 'compound') { // do nothing. Compound values are updated when its child metadata are updated return $item_metadata; } else { @@ -115,10 +115,10 @@ class Item_Metadata extends Repository { public function delete($item_metadata){} public function save_core_metadatum_value(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) { - $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object(); - if ($metadatum_type->get_core()) { + $metadata_type = $item_metadata->get_metadatum()->get_metadata_type_object(); + if ($metadata_type->get_core()) { $item = $item_metadata->get_item(); - $set_method = 'set_' . $metadatum_type->get_related_mapped_prop(); + $set_method = 'set_' . $metadata_type->get_related_mapped_prop(); $value = $item_metadata->get_value(); $item->$set_method( is_array( $value ) ? $value[0] : $value ); if ($item->validate_core_metadata()) { @@ -131,10 +131,10 @@ class Item_Metadata extends Repository { } public function save_terms_metadatum_value($item_metadata) { - $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object(); - if ($metadatum_type->get_primitive_type() == 'term') { + $metadata_type = $item_metadata->get_metadatum()->get_metadata_type_object(); + if ($metadata_type->get_primitive_type() == 'term') { $new_terms = $item_metadata->get_value(); - $taxonomy = new Entities\Taxonomy( $metadatum_type->get_option('taxonomy_id') ); + $taxonomy = new Entities\Taxonomy( $metadata_type->get_option('taxonomy_id') ); if( $taxonomy ){ $old = $item_metadata; @@ -222,17 +222,17 @@ class Item_Metadata extends Repository { public function get_value(Entities\Item_Metadata_Entity $item_metadata) { $unique = ! $item_metadata->is_multiple(); - $metadatum_type = $item_metadata->get_metadatum()->get_metadatum_type_object(); - if ($metadatum_type->get_core()) { + $metadata_type = $item_metadata->get_metadatum()->get_metadata_type_object(); + if ($metadata_type->get_core()) { $item = $item_metadata->get_item(); - $get_method = 'get_' . $metadatum_type->get_related_mapped_prop(); + $get_method = 'get_' . $metadata_type->get_related_mapped_prop(); return $item->$get_method(); - } elseif ($metadatum_type->get_primitive_type() == 'term') { + } elseif ($metadata_type->get_primitive_type() == 'term') { - if( is_numeric( $metadatum_type->get_option('taxonomy_id') ) ){ - $taxonomy = new Entities\Taxonomy( $metadatum_type->get_option('taxonomy_id') ); + if( is_numeric( $metadata_type->get_option('taxonomy_id') ) ){ + $taxonomy = new Entities\Taxonomy( $metadata_type->get_option('taxonomy_id') ); if( $taxonomy ){ $taxonomy_slug = $taxonomy->get_db_identifier(); } else { @@ -262,7 +262,7 @@ class Item_Metadata extends Repository { return $terms; - } elseif ($metadatum_type->get_primitive_type() == 'compound') { + } elseif ($metadata_type->get_primitive_type() == 'compound') { global $wpdb; $rows = $wpdb->get_results( diff --git a/src/classes/repositories/class-tainacan-logs.php b/src/classes/repositories/class-tainacan-logs.php index 15b4f51ab..6a9e0e402 100644 --- a/src/classes/repositories/class-tainacan-logs.php +++ b/src/classes/repositories/class-tainacan-logs.php @@ -293,9 +293,9 @@ class Logs extends Repository { } if ( $new_value instanceof Entities\Metadatum ) { - $type = $new_value->get_metadatum_type(); + $type = $new_value->get_metadata_type(); - if ( $type === 'Tainacan\Metadatum_Types\Core_Title' || $type === 'Tainacan\Metadatum_Types\Core_Description' ) { + if ( $type === 'Tainacan\Metadata_Types\Core_Title' || $type === 'Tainacan\Metadata_Types\Core_Description' ) { return false; } } diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php index 86000fad0..39aad76c5 100644 --- a/src/classes/repositories/class-tainacan-metadata.php +++ b/src/classes/repositories/class-tainacan-metadata.php @@ -13,11 +13,11 @@ class Metadata extends Repository { public $entities_type = '\Tainacan\Entities\Metadatum'; protected $default_metadata = 'default'; - public $metadatum_types = []; + public $metadata_types = []; public $core_metadata = [ - 'Tainacan\Metadatum_Types\Core_Title', - 'Tainacan\Metadatum_Types\Core_Description' + 'Tainacan\Metadata_Types\Core_Title', + 'Tainacan\Metadata_Types\Core_Description' ]; private static $instance = null; @@ -82,7 +82,7 @@ class Metadata extends Repository { //'on_error' => __('The description should be a text value', 'tainacan'), //'validation' => v::stringType()->notEmpty(), ], - 'metadatum_type' => [ + 'metadata_type' => [ 'map' => 'meta', 'title' => __( 'Type', 'tainacan' ), 'type' => 'string', @@ -141,7 +141,7 @@ class Metadata extends Repository { 'type' => 'string', 'description' => __( 'The default value for the metadata', 'tainacan' ), ], - 'metadatum_type_options' => [ // not showed in form + 'metadata_type_options' => [ // not showed in form 'map' => 'meta', 'title' => __( 'Metadata type options', 'tainacan' ), 'type' => 'array/object/string', @@ -249,7 +249,7 @@ class Metadata extends Repository { * * @param $class_name string | object The class name or the instance */ - public function register_metadatum_type( $class_name ){ + public function register_metadata_type( $class_name ){ // TODO: we shoud not allow registration of metadatum types of retricted core metadatum types (e.g. compound, term) by plugins @@ -257,8 +257,8 @@ class Metadata extends Repository { $class_name = get_class( $class_name ); } - if(!in_array( $class_name, $this->metadatum_types)){ - $this->metadatum_types[] = $class_name; + if(!in_array( $class_name, $this->metadata_types)){ + $this->metadata_types[] = $class_name; } } @@ -267,14 +267,14 @@ class Metadata extends Repository { * * @param $class_name string | object The class name or the instance */ - public function unregister_metadatum_type( $class_name ){ + public function unregister_metadata_type( $class_name ){ if( is_object( $class_name ) ){ $class_name = get_class( $class_name ); } - $key = array_search( $class_name, $this->metadatum_types ); + $key = array_search( $class_name, $this->metadata_types ); if($key !== false){ - unset( $this->metadatum_types[$key] ); + unset( $this->metadata_types[$key] ); } } @@ -478,22 +478,22 @@ class Metadata extends Repository { * NAME - return an Array of the names of metadatum types registered * * @param $output string CLASS | NAME - * @return array of Entities\Metadatum_Types\Metadatum_Type classes path name + * @return array of Entities\Metadata_Types\Metadata_Type classes path name */ - public function fetch_metadatum_types( $output = 'CLASS'){ + public function fetch_metadata_types( $output = 'CLASS'){ $return = []; - do_action('register_metadatum_types'); + do_action('register_metadata_types'); if( $output === 'NAME' ){ - foreach ($this->metadatum_types as $metadatum_type) { - $return[] = str_replace('Tainacan\Metadatum_Types\\','', $metadatum_type); + foreach ($this->metadata_types as $metadata_type) { + $return[] = str_replace('Tainacan\Metadata_Types\\','', $metadata_type); } return $return; } - return $this->metadatum_types; + return $this->metadata_types; } /** @@ -513,7 +513,7 @@ class Metadata extends Repository { 'name' => 'Description', 'description' => 'description', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Description', + 'metadata_type' => 'Tainacan\Metadata_Types\Core_Description', 'status' => 'publish', 'exposer_mapping' => [ 'dublin-core' => 'description' @@ -523,7 +523,7 @@ class Metadata extends Repository { 'name' => 'Title', 'description' => 'title', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Title', + 'metadata_type' => 'Tainacan\Metadata_Types\Core_Title', 'status' => 'publish', 'exposer_mapping' => [ 'dublin-core' => 'title' @@ -541,7 +541,7 @@ class Metadata extends Repository { } else { $exists = false; foreach ( $metadata as $metadatum ){ - if ( $metadatum->get_metadatum_type() === $data_core_metadatum['metadatum_type'] ) { + if ( $metadatum->get_metadata_type() === $data_core_metadatum['metadata_type'] ) { $exists = true; } } @@ -565,7 +565,7 @@ class Metadata extends Repository { public function disable_delete_core_metadata( $before, $post ){ $metadatum = $this->fetch( $post->ID ); - if ( $metadatum && in_array( $metadatum->get_metadatum_type(), $this->core_metadata ) && is_numeric($metadatum->get_collection_id()) ) { + if ( $metadatum && in_array( $metadatum->get_metadata_type(), $this->core_metadata ) && is_numeric($metadatum->get_collection_id()) ) { return false; } } @@ -584,7 +584,7 @@ class Metadata extends Repository { public function force_delete_core_metadata( $before, $post, $force_delete ){ $metadatum = $this->fetch( $post->ID ); - if ( $metadatum && in_array( $metadatum->get_metadatum_type(), $this->core_metadata ) && is_numeric($metadatum->get_collection_id()) ) { + if ( $metadatum && in_array( $metadatum->get_metadata_type(), $this->core_metadata ) && is_numeric($metadatum->get_collection_id()) ) { return false; } } @@ -607,7 +607,7 @@ class Metadata extends Repository { 'compare' => 'IN', ), array( - 'key' => 'metadatum_type', + 'key' => 'metadata_type', 'value' => $this->core_metadata, 'compare' => 'IN', ) @@ -665,14 +665,14 @@ class Metadata extends Repository { $metadatum = new Entities\Metadatum( $metadatum_id ); // handle core titles - if( strpos( $metadatum->get_metadatum_type(), 'Core') !== false ){ + if( strpos( $metadatum->get_metadata_type(), 'Core') !== false ){ $collection = new Entities\Collection( $collection_id ); $Tainacan_Items = \Tainacan\Repositories\Items::get_instance(); $items = $Tainacan_Items->fetch( ['s' => $search], $collection, 'OBJECT'); $return = []; foreach ($items as $item) { - if( strpos( $metadatum->get_metadatum_type(), 'Core_Title') !== false ){ + if( strpos( $metadatum->get_metadata_type(), 'Core_Title') !== false ){ $title = $item->get_title(); if(!empty($search) && stristr($title, $search) !== false) { @@ -819,13 +819,13 @@ class Metadata extends Repository { * */ private function pre_update_category_metadatum($metadatum) { - $metadatum_type = $metadatum->get_metadatum_type_object(); + $metadata_type = $metadatum->get_metadata_type_object(); $current_tax = ''; - if ($metadatum_type->get_primitive_type() == 'term') { + if ($metadata_type->get_primitive_type() == 'term') { - $options = $this->get_mapped_property($metadatum, 'metadatum_type_options'); - $metadatum_type->set_options($options); - $current_tax = $metadatum_type->get_option('taxonomy_id'); + $options = $this->get_mapped_property($metadatum, 'metadata_type_options'); + $metadata_type->set_options($options); + $current_tax = $metadata_type->get_option('taxonomy_id'); } $this->current_taxonomy = $current_tax; } @@ -841,11 +841,11 @@ class Metadata extends Repository { * @return void [type] [description] */ private function update_category_metadatum($metadatum) { - $metadatum_type = $metadatum->get_metadatum_type_object(); + $metadata_type = $metadatum->get_metadata_type_object(); $new_tax = ''; - if ($metadatum_type->get_primitive_type() == 'term') { - $new_tax = $metadatum_type->get_option('taxonomy_id'); + if ($metadata_type->get_primitive_type() == 'term') { + $new_tax = $metadata_type->get_option('taxonomy_id'); } if ($new_tax != $this->current_taxonomy) { @@ -864,10 +864,10 @@ class Metadata extends Repository { private function delete_category_metadatum($metadatum_id) { $metadatum = $this->fetch($metadatum_id); - $metadatum_type = $metadatum->get_metadatum_type_object(); + $metadata_type = $metadatum->get_metadata_type_object(); - if ($metadatum_type->get_primitive_type() == 'term') { - $removed_tax = $metadatum_type->get_option('taxonomy_id'); + if ($metadata_type->get_primitive_type() == 'term') { + $removed_tax = $metadata_type->get_option('taxonomy_id'); $collection = $metadatum->get_collection(); diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php index 1e0fe815a..ef1797e01 100644 --- a/src/classes/tainacan-creator.php +++ b/src/classes/tainacan-creator.php @@ -1,7 +1,7 @@ register_metadatum_type('Tainacan\Metadatum_Types\Text'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Textarea'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Date'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Numeric'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Selectbox'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Relationship'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Category'); -$Tainacan_Metadata->register_metadatum_type('Tainacan\Metadatum_Types\Compound'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Text'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Textarea'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Date'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Numeric'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Selectbox'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Relationship'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Category'); +$Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Compound'); $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance(); diff --git a/src/dev-interface/class-tainacan-dev-interface.php b/src/dev-interface/class-tainacan-dev-interface.php index fa3d5a3d5..ef2a873e2 100644 --- a/src/dev-interface/class-tainacan-dev-interface.php +++ b/src/dev-interface/class-tainacan-dev-interface.php @@ -175,10 +175,10 @@ class DevInterface { ( isset( $value ) ) ? $value : '', 'tnc_prop_metadatum' ) ?> - + - - metadatum_type_dropdown($post->ID,$value); ?> + + metadata_type_dropdown($post->ID,$value); ?> filter_type_dropdown($post->ID,$value); ?> @@ -332,7 +332,7 @@ class DevInterface { get_metadatum()->get_name().'">'; ?> - get_metadatum()->get_metadatum_type_object()->render( $item_meta ); ?> + get_metadatum()->get_metadata_type_object()->render( $item_meta ); ?> @@ -347,26 +347,26 @@ class DevInterface { } - function metadatum_type_dropdown($id,$selected) { + function metadata_type_dropdown($id,$selected) { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $class = ( class_exists( $selected ) ) ? new $selected() : ''; if(is_object( $class )){ - $selected = str_replace('Tainacan\Metadatum_Types\\','', get_class( $class ) ); + $selected = str_replace('Tainacan\Metadata_Types\\','', get_class( $class ) ); } - $metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME'); + $metadata_types = $Tainacan_Metadata->fetch_metadata_types('NAME'); ?> - + + set_options($options); echo $class->form(); } @@ -454,12 +454,12 @@ class DevInterface { if ($entity->validate_prop($prop)) { // we cannot user repository->insert here, it would create an infinite loop - if ($prop == 'metadatum_type') { + if ($prop == 'metadata_type') { //TODO: This can be better - $class = '\Tainacan\Metadatum_Types\\'.$value; - update_post_meta($post_id, 'metadatum_type_options', $_POST['metadatum_type_'.strtolower( $value ) ] ); - update_post_meta($post_id, 'metadatum_type', wp_slash( get_class( new $class() ) ) ); - } elseif($prop == 'metadatum_type_options' || $prop == 'filter_type_options') { + $class = '\Tainacan\Metadata_Types\\'.$value; + update_post_meta($post_id, 'metadata_type_options', $_POST['metadata_type_'.strtolower( $value ) ] ); + update_post_meta($post_id, 'metadata_type', wp_slash( get_class( new $class() ) ) ); + } elseif($prop == 'metadata_type_options' || $prop == 'filter_type_options') { continue; } elseif ($prop == 'filter_type') { $class = str_replace('\\\\','\\','\Tainacan\Filter_Types\\'.$value ); @@ -510,7 +510,7 @@ class DevInterface { foreach ($metalist as $meta) { $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($entity, $meta); - $pos = strpos($item_meta->get_metadatum()->get_metadatum_type(), 'Core'); + $pos = strpos($item_meta->get_metadatum()->get_metadata_type(), 'Core'); if( $pos !== false ){ continue; } diff --git a/src/exposers/class-tainacan-exposers.php b/src/exposers/class-tainacan-exposers.php index fa2426013..0283fd18b 100644 --- a/src/exposers/class-tainacan-exposers.php +++ b/src/exposers/class-tainacan-exposers.php @@ -317,13 +317,13 @@ class Exposers { $metadatum = new \Tainacan\Entities\Metadatum(); if( - array_key_exists('metadatum_type', $mapper_metadatum) && - $mapper_metadatum['metadatum_type'] != false && - class_exists($mapper_metadatum['metadatum_type']) + array_key_exists('metadata_type', $mapper_metadatum) && + $mapper_metadatum['metadata_type'] != false && + class_exists($mapper_metadatum['metadata_type']) ) { - $metadatum->set_metadatum_type($mapper_metadatum['metadatum_type']); + $metadatum->set_metadata_type($mapper_metadatum['metadata_type']); } else { - $metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text'); + $metadatum->set_metadata_type('Tainacan\Metadata_Types\Text'); } $metadatum->set_name($mapper_metadatum['label']); $metadatum->set_description($mapper_metadatum['URI']); diff --git a/src/exposers/mappers/class-tainacan-dublin-core.php b/src/exposers/mappers/class-tainacan-dublin-core.php index 908b9d279..b6eca454f 100644 --- a/src/exposers/mappers/class-tainacan-dublin-core.php +++ b/src/exposers/mappers/class-tainacan-dublin-core.php @@ -30,7 +30,7 @@ class Dublin_Core extends Mapper { 'date' => [ 'URI' => 'http://purl.org/dc/elements/1.1/date', 'label' => 'Date', - 'metadatum_type' => 'date' + 'metadata_type' => 'date' ], 'description' => [ 'URI' => 'http://purl.org/dc/elements/1.1/description', diff --git a/src/exposers/mappers/class-tainacan-mapper.php b/src/exposers/mappers/class-tainacan-mapper.php index 605f6443f..e95aa78d6 100644 --- a/src/exposers/mappers/class-tainacan-mapper.php +++ b/src/exposers/mappers/class-tainacan-mapper.php @@ -13,12 +13,12 @@ abstract class Mapper { * ['slug'] => [ * 'URI' => 'http://...', // URI of the metadatum description * 'label' => 'Label', // Label to show on UI - * 'metadatum_type' => 'date', // Tainacan recomended metadatum type, default text + * 'metadata_type' => 'date', // Tainacan recomended metadatum type, default text * 'core_metadatum' => 'description' // if have a core tainacan metadatum, what? * ['date' => [ * 'URI' => 'http://purl.org/dc/elements/1.1/date', * 'label' => 'Date', - * 'metadatum_type' => 'date' + * 'metadata_type' => 'date' * ], * 'description' => [ * 'URI' => 'http://purl.org/dc/elements/1.1/description', diff --git a/src/importer/class-tainacan-old-tainacan.php b/src/importer/class-tainacan-old-tainacan.php index 6f6eb3794..8811b5159 100644 --- a/src/importer/class-tainacan-old-tainacan.php +++ b/src/importer/class-tainacan-old-tainacan.php @@ -342,14 +342,14 @@ class Old_Tainacan extends Importer{ $type = $this->define_type($type); $newMetadatum->set_name($name); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\\'.$type); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\\'.$type); if(strcmp($type, "Category") === 0) { $taxonomy_id = $meta->metadata->taxonomy; if(isset($created_categories[$taxonomy_id])) { $new_category_id = $created_categories[$taxonomy_id]['new_id']; - $newMetadatum->set_metadatum_type_options(['taxonomy_id' => $new_category_id]); + $newMetadatum->set_metadata_type_options(['taxonomy_id' => $new_category_id]); } }else if(strcmp($type, "Relationship") === 0) { @@ -358,7 +358,7 @@ class Old_Tainacan extends Importer{ if(isset($relationships[$taxonomy_id])) { $new_collection_id = $relationships[$taxonomy_id]['new_id']; - $newMetadatum->set_metadatum_type_options(['collection_id' => $new_collection_id]); + $newMetadatum->set_metadata_type_options(['collection_id' => $new_collection_id]); } }else if(strcmp($type, "Compound") === 0) { @@ -770,7 +770,7 @@ class Old_Tainacan extends Importer{ $newMetadatum->set_name($meta_name); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\\'.$type); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\\'.$type); $newMetadatum->set_collection($this->actual_collection); $newMetadatum->validate(); // there is no user input here, so we can be sure it will validate. diff --git a/src/importer/class-tainacan-test-importer.php b/src/importer/class-tainacan-test-importer.php index 3ab6e66a3..626cc2856 100644 --- a/src/importer/class-tainacan-test-importer.php +++ b/src/importer/class-tainacan-test-importer.php @@ -156,8 +156,8 @@ class Test_Importer extends Importer { $metadatum = new Entities\Metadatum(); $metadatum->set_name('Colora'); $metadatum->set_collection($col1); - $metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category'); - $metadatum->set_metadatum_type_options([ + $metadatum->set_metadata_type('Tainacan\Metadata_Types\Category'); + $metadatum->set_metadata_type_options([ 'taxonomy_id' => $this->get_transient('tax_1_id'), 'allow_new_terms' => true ]); @@ -177,8 +177,8 @@ class Test_Importer extends Importer { $metadatum = new Entities\Metadatum(); $metadatum->set_name('Qualitya'); $metadatum->set_collection($col1); - $metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category'); - $metadatum->set_metadatum_type_options([ + $metadatum->set_metadata_type('Tainacan\Metadata_Types\Category'); + $metadatum->set_metadata_type_options([ 'taxonomy_id' => $this->get_transient('tax_2_id'), 'allow_new_terms' => true ]); @@ -211,7 +211,7 @@ class Test_Importer extends Importer { $metadatum = new Entities\Metadatum(); $metadatum->set_name('Test Metadatum'); $metadatum->set_collection($col2); - $metadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text'); + $metadatum->set_metadata_type('Tainacan\Metadata_Types\Text'); $metadatum->set_status('publish'); if ($metadatum->validate()) { @@ -261,9 +261,9 @@ class Test_Importer extends Importer { $metadatum1 = $this->metadata_repo->fetch( $this->get_transient('tax_1_metadatum') ); - $options = $metadatum1->get_metadatum_type_options(); + $options = $metadatum1->get_metadata_type_options(); $options['allow_new_terms'] = false; - $metadatum1->set_metadatum_type_options($options); + $metadatum1->set_metadata_type_options($options); if ($metadatum1->validate()) { $this->metadata_repo->insert($metadatum1); } else { @@ -272,9 +272,9 @@ class Test_Importer extends Importer { } $metadatum2 = $this->metadata_repo->fetch( $this->get_transient('tax_2_metadatum') ); - $options = $metadatum2->get_metadatum_type_options(); + $options = $metadatum2->get_metadata_type_options(); $options['allow_new_terms'] = false; - $metadatum2->set_metadatum_type_options($options); + $metadatum2->set_metadata_type_options($options); if ($metadatum2->validate()) { $this->metadata_repo->insert($metadatum2); } else { diff --git a/src/js/main.js b/src/js/main.js index a5747e0f1..7881cdddc 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -10,14 +10,14 @@ Vue.use(Buefy); Vue.use(VueCustomElement); -import Text from '../classes/metadatum-types/text/Text.vue'; -import Textarea from '../classes/metadatum-types/textarea/Textarea.vue'; -import Selectbox from '../classes/metadatum-types/selectbox/Selectbox.vue'; -import Numeric from '../classes/metadatum-types/numeric/Numeric.vue'; -import Date from '../classes/metadatum-types/date/Date.vue'; -import Relationship from '../classes/metadatum-types/relationship/Relationship.vue'; +import Text from '../classes/metadata-types/text/Text.vue'; +import Textarea from '../classes/metadata-types/textarea/Textarea.vue'; +import Selectbox from '../classes/metadata-types/selectbox/Selectbox.vue'; +import Numeric from '../classes/metadata-types/numeric/Numeric.vue'; +import Date from '../classes/metadata-types/date/Date.vue'; +import Relationship from '../classes/metadata-types/relationship/Relationship.vue'; -import FormRelationship from '../classes/metadatum-types/relationship/FormRelationship.vue'; +import FormRelationship from '../classes/metadata-types/relationship/FormRelationship.vue'; import FilterCustomInterval from '../classes/filter-types/custom-interval/CustomInterval.vue'; import FilterSelectbox from '../classes/filter-types/selectbox/Selectbox.vue'; diff --git a/src/js/store/modules/metadata/actions.js b/src/js/store/modules/metadata/actions.js index c962c929c..d062c6572 100644 --- a/src/js/store/modules/metadata/actions.js +++ b/src/js/store/modules/metadata/actions.js @@ -35,7 +35,7 @@ export const sendMetadatum = ({commit}, {collectionId, name, metadatumType, stat endpoint = '/metadata/'; axios.tainacan.post(endpoint + '?context=edit', { name: name, - metadatum_type: metadatumType, + metadata_type: metadatumType, status: status }) .then(res => { @@ -113,7 +113,7 @@ export const updateCollectionMetadataOrder = ({ dispatch }, {collectionId, metad export const fetchMetadatumTypes = ({commit}) => { return new Promise((resolve, reject) => { - axios.tainacan.get('/metadatum-types') + axios.tainacan.get('/metadata-types') .then((res) => { let metadatumTypes = res.data; commit('setMetadatumTypes', metadatumTypes); diff --git a/src/js/store/modules/search/actions.js b/src/js/store/modules/search/actions.js index 2c889f083..fe67cacef 100644 --- a/src/js/store/modules/search/actions.js +++ b/src/js/store/modules/search/actions.js @@ -77,15 +77,15 @@ export const setOrderBy = ({ commit }, orderBy ) => { commit('setPostQueryAttribute', { attr: 'orderby', value: 'date' } ); } else if (orderBy.id == 'author_name') { commit('setPostQueryAttribute', { attr: 'orderby', value: 'author_name' } ); - } else if (orderBy.metadatum_type_object.primitive_type == 'float' || orderBy.metadatum_type_object.primitive_type == 'int') { + } else if (orderBy.metadata_type_object.primitive_type == 'float' || orderBy.metadata_type_object.primitive_type == 'int') { commit('setPostQueryAttribute', { attr: 'meta_key', value: orderBy.id } ); commit('setPostQueryAttribute', { attr: 'orderby', value: 'meta_value_num' } ); - } else if (orderBy.metadatum_type_object.primitive_type == 'date') { + } else if (orderBy.metadata_type_object.primitive_type == 'date') { commit('setPostQueryAttribute', { attr: 'meta_key', value: orderBy.id } ); commit('setPostQueryAttribute', { attr: 'meta_type', value: 'DATETIME' } ); commit('setPostQueryAttribute', { attr: 'orderby', value: 'meta_value' } ); - } else if (orderBy.metadatum_type_object.core) { - commit('setPostQueryAttribute', { attr: 'orderby', value: orderBy.metadatum_type_object.related_mapped_prop } ); + } else if (orderBy.metadata_type_object.core) { + commit('setPostQueryAttribute', { attr: 'orderby', value: orderBy.metadata_type_object.related_mapped_prop } ); } else { commit('setPostQueryAttribute', { attr: 'meta_key', value: orderBy.id } ); commit('setPostQueryAttribute', { attr: 'orderby', value: 'meta_value' } ); diff --git a/src/languages/tainacan-pt_BR.po b/src/languages/tainacan-pt_BR.po index a64ba4fa9..b34364fbb 100644 --- a/src/languages/tainacan-pt_BR.po +++ b/src/languages/tainacan-pt_BR.po @@ -561,20 +561,20 @@ msgid "Approved" msgstr "Aprovado" #: admin/tainacan-admin-i18n.php:130 -#: classes/metadatum-types/category/class-tainacan-category.php:35 -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:26 +#: classes/metadata-types/category/class-tainacan-category.php:35 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:26 msgid "Collection Related" msgstr "Coleção relacionada" #: admin/tainacan-admin-i18n.php:131 -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:30 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:30 #, fuzzy #| msgid "Metadata for search" msgid "Metadata for search" msgstr "Metadados para busca" #: admin/tainacan-admin-i18n.php:132 -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:34 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:34 msgid "Allow repeated items" msgstr "Permitir itens repetidos" @@ -585,12 +585,12 @@ msgid "Select taxonomy" msgstr "Categoria pai" #: admin/tainacan-admin-i18n.php:134 -#: classes/metadatum-types/category/class-tainacan-category.php:39 +#: classes/metadata-types/category/class-tainacan-category.php:39 msgid "Input type" msgstr "Tipo de entrada" #: admin/tainacan-admin-i18n.php:135 -#: classes/metadatum-types/category/class-tainacan-category.php:43 +#: classes/metadata-types/category/class-tainacan-category.php:43 msgid "Allow new terms" msgstr "Permitir termos novos" @@ -1433,7 +1433,7 @@ msgstr "" msgid "Limits the result set to collections with a specific name" msgstr "Limita o conjunto de resultados a coleções com um nome específico" -#: api/endpoints/class-tainacan-rest-metadatum-types-controller.php:26 +#: api/endpoints/class-tainacan-rest-metadata-types-controller.php:26 #: api/endpoints/class-tainacan-rest-filter-types-controller.php:26 #, fuzzy msgid "The structure of objects returned." @@ -1649,26 +1649,26 @@ msgstr "Novo termo de gênero" msgid "You can not have two terms with the same name at the same level" msgstr "Você não pode ter dois termos com o mesmo nome em um mesmo nível" -#: classes/metadatum-types/category/class-tainacan-category.php:36 -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:27 +#: classes/metadata-types/category/class-tainacan-category.php:36 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:27 msgid "Select the collection to fetch items" msgstr "Selecione a coleção para buscar itens" -#: classes/metadatum-types/category/class-tainacan-category.php:40 +#: classes/metadata-types/category/class-tainacan-category.php:40 msgid "The html type of the terms list " msgstr "O tipo de html utilizado na lista de termos" -#: classes/metadatum-types/category/class-tainacan-category.php:44 +#: classes/metadata-types/category/class-tainacan-category.php:44 msgid "Allows to create new terms" msgstr "Permite a criação de novos termos" -#: classes/metadatum-types/category/class-tainacan-category.php:70 +#: classes/metadata-types/category/class-tainacan-category.php:70 #, fuzzy #| msgid "Please select a category" msgid "Please select a taxonomy" msgstr "Por favor, selecione uma taxonomia." -#: classes/metadatum-types/category/class-tainacan-category.php:88 +#: classes/metadata-types/category/class-tainacan-category.php:88 #, fuzzy #| msgid "" #| "You can not have 2 taxonomy metadata using the same taxonomy in a " @@ -1679,18 +1679,18 @@ msgstr "" "Você não pode ter 2 metadados de taxonomia utilizando a mesma taxonomia em " "uma coleção." -#: classes/metadatum-types/core-description/class-tainacan-core-description.php:71 -#: classes/metadatum-types/core-title/class-tainacan-core-title.php:72 +#: classes/metadata-types/core-description/class-tainacan-core-description.php:71 +#: classes/metadata-types/core-title/class-tainacan-core-title.php:72 msgid "Core Metadata can not accept multiple values" msgstr "Metadados fixos (Core) não podem aceitar valores múltiplos" -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:31 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:31 #, fuzzy #| msgid "Select the metadata to help the search" msgid "Select the metadata to help the search" msgstr "Selecione os metadados que irão auxiliar na busca" -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:35 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:35 #, fuzzy #| msgid "Allow different items with the same item selected" msgid "" @@ -1700,23 +1700,23 @@ msgstr "" "Permite que itens diferentes sejam relacionados ao um mesmo item selecionado " "de outra coleção" -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:60 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:60 #, fuzzy #| msgid "The collection ID" msgid "Invalid collection ID" msgstr "O ID da coleção" -#: classes/metadatum-types/relationship/class-tainacan-relationship.php:64 +#: classes/metadata-types/relationship/class-tainacan-relationship.php:64 #, fuzzy #| msgid "The metadatum Collection related is required" msgid "The related collection is required" msgstr "O metadado Coleção é requerido" -#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:26 +#: classes/metadata-types/selectbox/class-tainacan-selectbox.php:26 msgid "Options" msgstr "Opções" -#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:27 +#: classes/metadata-types/selectbox/class-tainacan-selectbox.php:27 #, fuzzy #| msgid "Create the options for the select, hit enter to add new one" msgid "Creates options for what is selected. Hit to add a new one." @@ -1725,7 +1725,7 @@ msgstr "" "uma nova opção." # DESCOBRIR O CONTEXTO DESSA “REQUISIÇAO” -#: classes/metadatum-types/selectbox/class-tainacan-selectbox.php:56 +#: classes/metadata-types/selectbox/class-tainacan-selectbox.php:56 #, fuzzy #| msgid "Required" msgid "Required options" diff --git a/src/migrate-post-type.php b/src/migrate-post-type.php index 92e04f90b..494d5d2b7 100644 --- a/src/migrate-post-type.php +++ b/src/migrate-post-type.php @@ -24,66 +24,130 @@ function tainacan_migrate_post_type_field_to_metadatum(){ '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_key' => 'metadatum_type'], + ['meta_key' => 'metadata_type'], ['meta_key' => 'field_type'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_key' => 'metadatum_type_options'], + ['meta_key' => 'metadata_type_options'], ['meta_key' => 'field_type_options'], '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_key' => 'metadata_type'], + ['meta_key' => 'metadatum_type'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_key' => 'metadata_type_options'], + ['meta_key' => 'metadatum_type_options'], + '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Core_Description'], + ['meta_value' => 'Tainacan\Metadata_Types\Core_Description'], ['meta_value' => 'Tainacan\Field_Types\Core_Description'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Core_Title'], + ['meta_value' => 'Tainacan\Metadata_Types\Core_Title'], ['meta_value' => 'Tainacan\Field_Types\Core_Title'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Text'], + ['meta_value' => 'Tainacan\Metadata_Types\Text'], ['meta_value' => 'Tainacan\Field_Types\Text'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Textarea'], + ['meta_value' => 'Tainacan\Metadata_Types\Textarea'], ['meta_value' => 'Tainacan\Field_Types\Textarea'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Date'], + ['meta_value' => 'Tainacan\Metadata_Types\Date'], ['meta_value' => 'Tainacan\Field_Types\Date'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Numeric'], + ['meta_value' => 'Tainacan\Metadata_Types\Numeric'], ['meta_value' => 'Tainacan\Field_Types\Numeric'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Selectbox'], + ['meta_value' => 'Tainacan\Metadata_Types\Selectbox'], ['meta_value' => 'Tainacan\Field_Types\Selectbox'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Relationship'], + ['meta_value' => 'Tainacan\Metadata_Types\Relationship'], ['meta_value' => 'Tainacan\Field_Types\Relationship'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Category'], + ['meta_value' => 'Tainacan\Metadata_Types\Category'], ['meta_value' => 'Tainacan\Field_Types\Category'], '%s', '%s'); $wpdb->update($wpdb->postmeta, - ['meta_value' => 'Tainacan\Metadatum_Types\Compound'], + ['meta_value' => 'Tainacan\Metadata_Types\Compound'], ['meta_value' => 'Tainacan\Field_Types\Compound'], '%s', '%s'); + + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Core_Description'], + ['meta_value' => 'Tainacan\Metadatum_Types\Core_Description'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Core_Title'], + ['meta_value' => 'Tainacan\Metadatum_Types\Core_Title'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Text'], + ['meta_value' => 'Tainacan\Metadatum_Types\Text'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Textarea'], + ['meta_value' => 'Tainacan\Metadatum_Types\Textarea'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Date'], + ['meta_value' => 'Tainacan\Metadatum_Types\Date'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Numeric'], + ['meta_value' => 'Tainacan\Metadatum_Types\Numeric'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Selectbox'], + ['meta_value' => 'Tainacan\Metadatum_Types\Selectbox'], + '%s', '%s'); + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Relationship'], + ['meta_value' => 'Tainacan\Metadatum_Types\Relationship'], + '%s', '%s'); + + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Category'], + ['meta_value' => 'Tainacan\Metadatum_Types\Category'], + '%s', '%s'); + + + $wpdb->update($wpdb->postmeta, + ['meta_value' => 'Tainacan\Metadata_Types\Compound'], + ['meta_value' => 'Tainacan\Metadatum_Types\Compound'], + '%s', '%s'); + } ?> \ No newline at end of file diff --git a/src/theme-helper/table-view-mode.vue b/src/theme-helper/table-view-mode.vue index 7634c45d5..695b12e99 100644 --- a/src/theme-helper/table-view-mode.vue +++ b/src/theme-helper/table-view-mode.vue @@ -12,9 +12,9 @@ class="column-default-width" :class="{ 'thumbnail-cell': column.metadatum == 'row_thumbnail', - 'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false, - 'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false, - 'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false, + 'column-small-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Date' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Numeric') : false, + 'column-medium-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Selectbox' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Category' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Compound') : false, + 'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Textarea') : false, }" :custom-key="column.slug">
{{ column.name }}
@@ -37,11 +37,11 @@ class="column-default-width" :class="{ 'thumbnail-cell': column.metadatum == 'row_thumbnail', - 'column-main-content' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.related_mapped_prop == 'title') : false, - 'column-needed-width column-align-right' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false, - 'column-small-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Date' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Numeric') : false, - 'column-medium-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Selectbox' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Category' || column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Compound') : false, - 'column-large-width' : column.metadatum_type_object != undefined ? (column.metadatum_type_object.className == 'Tainacan\\Metadatum_Types\\Textarea') : false, + 'column-main-content' : column.metadata_type_object != undefined ? (column.metadata_type_object.related_mapped_prop == 'title') : false, + 'column-needed-width column-align-right' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Numeric') : false, + 'column-small-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Date' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Numeric') : false, + 'column-medium-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Selectbox' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Category' || column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Compound') : false, + 'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.className == 'Tainacan\\Metadata_Types\\Textarea') : false, }" @click="goToItemPage(item)"> diff --git a/tests/factories/class-tainacan-metadatum-factory.php b/tests/factories/class-tainacan-metadatum-factory.php index 87017aad1..289cbc80f 100644 --- a/tests/factories/class-tainacan-metadatum-factory.php +++ b/tests/factories/class-tainacan-metadatum-factory.php @@ -4,7 +4,7 @@ namespace Tainacan\Tests\Factories; class Metadatum_Factory { private $metadatum; - protected $metadatum_type; + protected $metadata_type; public function create_metadatum($type, $primitive_type = []){ if(empty($type)){ @@ -15,8 +15,8 @@ class Metadatum_Factory { $type = ucwords(strtolower($type), '_'); } - $this->metadatum_type = "\Tainacan\Metadatum_Types\\$type"; - $this->metadatum = new $this->metadatum_type(/* Here goes the primitive type */); + $this->metadata_type = "\Tainacan\Metadata_Types\\$type"; + $this->metadatum = new $this->metadata_type(/* Here goes the primitive type */); return $this->metadatum; } diff --git a/tests/test-api-export.php b/tests/test-api-export.php index cae4b3bf6..dc28397b8 100644 --- a/tests/test-api-export.php +++ b/tests/test-api-export.php @@ -26,7 +26,7 @@ class TAINACAN_REST_Export_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'teste_Export', 'description' => 'descricao', 'collection' => $collection, - 'metadatum_type' => $type, + 'metadata_type' => $type, 'exposer_mapping' => [ 'dublin-core' => 'language' ] diff --git a/tests/test-api-exposers.php b/tests/test-api-exposers.php index 932e5cb11..9643d5dac 100644 --- a/tests/test-api-exposers.php +++ b/tests/test-api-exposers.php @@ -29,7 +29,7 @@ class TAINACAN_REST_Exposers extends TAINACAN_UnitApiTestCase { 'name' => 'teste_Expose', 'description' => 'descricao', 'collection' => $collection, - 'metadatum_type' => $type, + 'metadata_type' => $type, 'exposer_mapping' => [ 'dublin-core' => 'language' ] diff --git a/tests/test-api-filters.php b/tests/test-api-filters.php index 372a01b24..f9b5c0f51 100644 --- a/tests/test-api-filters.php +++ b/tests/test-api-filters.php @@ -24,7 +24,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'Metadata filtered', 'description' => 'Is filtered', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Numeric', + 'metadata_type' => 'Tainacan\Metadata_Types\Numeric', ), true, true @@ -185,7 +185,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'Metadatum filtered', 'description' => 'Is filtered', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Numeric' + 'metadata_type' => 'Tainacan\Metadata_Types\Numeric' ), true ); @@ -196,7 +196,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'Other filtered', 'description' => 'Is filtered', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Numeric' + 'metadata_type' => 'Tainacan\Metadata_Types\Numeric' ), true ); @@ -273,7 +273,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'Metadatum filtered', 'description' => 'Is filtered', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text' + 'metadata_type' => 'Tainacan\Metadata_Types\Text' ), true ); @@ -284,7 +284,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'Metadatum filtered', 'description' => 'Is filtered', 'collection_id' => 'default', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text' + 'metadata_type' => 'Tainacan\Metadata_Types\Text' ), true ); diff --git a/tests/test-api-item-metadata.php b/tests/test-api-item-metadata.php index d2050cb3f..c5346e969 100644 --- a/tests/test-api-item-metadata.php +++ b/tests/test-api-item-metadata.php @@ -29,7 +29,7 @@ class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'name' => 'teste_metadado', 'description' => 'descricao', 'collection' => $collection, - 'metadatum_type' => $type, + 'metadata_type' => $type, 'accept_suggestion' => true ), true, diff --git a/tests/test-api-metadata.php b/tests/test-api-metadata.php index 3fa6a261c..94b47c1e6 100644 --- a/tests/test-api-metadata.php +++ b/tests/test-api-metadata.php @@ -24,7 +24,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { array( 'name' => 'Moeda', 'description' => 'Descreve campo moeda.', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ) ); @@ -60,7 +60,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve valor do campo data.', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -79,7 +79,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { array( 'name' => 'Ano de Publicação', 'description' => 'Uma data no formato dd/mm/aaaa.', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ) ); @@ -115,7 +115,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve valor do campo data.', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -126,7 +126,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve valor do campo data.', 'collection_id' => 'default', 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -171,7 +171,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve valor do campo data.', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -244,7 +244,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve o dado do campo data.', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'multiple' => 'yes' ), true @@ -322,7 +322,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'No Statement', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'multiple' => 'yes' ), true @@ -350,7 +350,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'No Statement', 'collection_id' => 'default', 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'multiple' => 'yes' ), true @@ -378,7 +378,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'No Statement', 'collection_id' => 'default', 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'multiple' => 'no' ), true @@ -446,7 +446,7 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase { 'description' => 'Descreve valor do campo data.', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); diff --git a/tests/test-api-metadatum-types.php b/tests/test-api-metadatum-types.php index d2dd7f3dd..03334c514 100644 --- a/tests/test-api-metadatum-types.php +++ b/tests/test-api-metadatum-types.php @@ -5,11 +5,11 @@ namespace Tainacan\Tests; /** * @group api */ -class TAINACAN_REST_Metadatum_Types_Controller extends TAINACAN_UnitApiTestCase { +class TAINACAN_REST_Metadata_Types_Controller extends TAINACAN_UnitApiTestCase { - public function test_get_metadatum_types(){ + public function test_get_metadata_types(){ - $ftype_request = new \WP_REST_Request('GET', $this->namespace . '/metadatum-types'); + $ftype_request = new \WP_REST_Request('GET', $this->namespace . '/metadata-types'); $ftype_response = $this->server->dispatch($ftype_request); @@ -17,12 +17,12 @@ class TAINACAN_REST_Metadatum_Types_Controller extends TAINACAN_UnitApiTestCase $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); - $metadatum_types = $Tainacan_Metadata->fetch_metadatum_types('NAME'); + $metadata_types = $Tainacan_Metadata->fetch_metadata_types('NAME'); - $this->assertEquals(count($metadatum_types), count($data)); + $this->assertEquals(count($metadata_types), count($data)); foreach ($data as $ftype){ - $this->assertContains($ftype['name'], $metadatum_types); + $this->assertContains($ftype['name'], $metadata_types); } } } diff --git a/tests/test-api-queries.php b/tests/test-api-queries.php index fd25a9f79..e2eb90442 100644 --- a/tests/test-api-queries.php +++ b/tests/test-api-queries.php @@ -106,7 +106,7 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase { // Create Metadata and Metadatum Type - $metadatum_type = $this->tainacan_metadatum_factory->create_metadatum('text'); + $metadata_type = $this->tainacan_metadatum_factory->create_metadatum('text'); $metadatumA1 = $this->tainacan_entity_factory->create_entity( 'metadatum', @@ -115,7 +115,7 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase { 'description' => 'Simple metadatum in collection A', 'status' => 'publish', 'collection' => $collectionA, - 'metadatum_type' => $metadatum_type + 'metadata_type' => $metadata_type ], true ); @@ -127,7 +127,7 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase { 'description' => 'Simple metadatum in collection A', 'status' => 'publish', 'collection' => $collectionA, - 'metadatum_type' => $metadatum_type + 'metadata_type' => $metadata_type ], true ); @@ -139,7 +139,7 @@ class TAINACAN_REST_Queries extends TAINACAN_UnitApiTestCase { 'description' => 'Multiple metadatum in a collection A', 'status' => 'publish', 'collection' => $collectionA, - 'metadatum_type' => $metadatum_type, + 'metadata_type' => $metadata_type, 'multiple' => 'yes' ], true diff --git a/tests/test-category-metadatum-types.php b/tests/test-category-metadatum-types.php index 992755656..d4259b91e 100644 --- a/tests/test-category-metadatum-types.php +++ b/tests/test-category-metadatum-types.php @@ -16,7 +16,7 @@ use Tainacan\Entities; class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { - function test_category_metadatum_types() { + function test_category_metadata_types() { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); @@ -45,9 +45,9 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Category', + 'metadata_type' => 'Tainacan\Metadata_Types\Category', 'status' => 'publish', - 'metadatum_type_options' => [ + 'metadata_type_options' => [ 'taxonomy_id' => $tax->get_id(), 'allow_new_terms' => false ] @@ -72,7 +72,7 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta2', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Category', + 'metadata_type' => 'Tainacan\Metadata_Types\Category', 'status' => 'draft', ), true @@ -104,9 +104,9 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { $this->assertFalse($item_metadata->validate(), 'item metadata should not validate because it does not allow new terms'); // Lets change it - $options = $metadatum->get_metadatum_type_options(); + $options = $metadatum->get_metadata_type_options(); $options['allow_new_terms'] = true; - $metadatum->set_metadatum_type_options($options); + $metadatum->set_metadata_type_options($options); $metadatum->validate(); $metadatum = $Tainacan_Metadata->insert($metadatum); @@ -123,7 +123,7 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { $this->assertEquals('Tainacan\Entities\Term', get_class($check_item_metadata->get_value())); // test 2 metadata with same category - $metadatum2->set_metadatum_type_options([ + $metadatum2->set_metadata_type_options([ 'taxonomy_id' => $tax->get_id(), ]); $metadatum2->set_status('publish'); @@ -131,7 +131,7 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { $this->assertFalse($metadatum2->validate(), 'Category Metadatum should not validate when using a category in use by another metadatum in the same collection'); $errors = $metadatum2->get_errors(); $this->assertInternalType('array', $errors); - $this->assertArrayHasKey('taxonomy_id', $errors[0]['metadatum_type_options']); + $this->assertArrayHasKey('taxonomy_id', $errors[0]['metadata_type_options']); } function test_relate_taxonomy() { @@ -168,9 +168,9 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Category', + 'metadata_type' => 'Tainacan\Metadata_Types\Category', 'status' => 'publish', - 'metadatum_type_options' => [ + 'metadata_type_options' => [ 'taxonomy_id' => $tax->get_id(), 'allow_new_terms' => false ] @@ -181,7 +181,7 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { $checkTax = $Tainacan_Taxonomies->fetch($tax->get_id()); $this->assertContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be added to taxonomy when metadatum is created'); - $metadatum->set_metadatum_type_options([ + $metadatum->set_metadata_type_options([ 'taxonomy_id' => $tax2->get_id(), 'allow_new_terms' => false ]); @@ -243,9 +243,9 @@ class CategoryMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Category', + 'metadata_type' => 'Tainacan\Metadata_Types\Category', 'status' => 'publish', - 'metadatum_type_options' => [ + 'metadata_type_options' => [ 'taxonomy_id' => $tax->get_id(), 'allow_new_terms' => true ] diff --git a/tests/test-compound-metadatum-types.php b/tests/test-compound-metadatum-types.php index a5549f52e..d37855579 100644 --- a/tests/test-compound-metadatum-types.php +++ b/tests/test-compound-metadatum-types.php @@ -16,7 +16,7 @@ use Tainacan\Entities; class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { - function test_compound_metadatum_types() { + function test_compound_metadata_types() { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); @@ -36,7 +36,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Compound', + 'metadata_type' => 'Tainacan\Metadata_Types\Compound', 'status' => 'publish', ), true @@ -48,7 +48,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta2', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish', 'parent' => $metadatum->get_id(), ), @@ -61,7 +61,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta3', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish', 'parent' => $metadatum->get_id(), ), @@ -115,7 +115,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { } - function test_multiple_compound_metadatum_types() { + function test_multiple_compound_metadata_types() { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); @@ -135,7 +135,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Compound', + 'metadata_type' => 'Tainacan\Metadata_Types\Compound', 'status' => 'publish', 'multiple' => 'yes' ), @@ -148,7 +148,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta2', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish', 'parent' => $metadatum->get_id(), ), @@ -161,7 +161,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta3', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish', 'parent' => $metadatum->get_id(), ), @@ -266,7 +266,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Compound', + 'metadata_type' => 'Tainacan\Metadata_Types\Compound', 'status' => 'publish', 'multiple' => 'yes' ), @@ -275,12 +275,12 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { $newMetadatum = new \Tainacan\Entities\Metadatum(); $newMetadatum->set_name('test_multiple'); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category'); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\Category'); $newMetadatum->set_parent($metadatum->get_id()); $this->assertFalse($newMetadatum->validate(), 'You cant add a category metadatum inside a multiple compound metadatum'); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text'); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\Text'); $this->assertTrue($newMetadatum->validate()); @@ -304,7 +304,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Compound', + 'metadata_type' => 'Tainacan\Metadata_Types\Compound', 'status' => 'publish', 'multiple' => 'no' ), @@ -313,7 +313,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { $newMetadatum = new \Tainacan\Entities\Metadatum(); $newMetadatum->set_name('test_multiple'); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Category'); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\Category'); $newMetadatum->set_parent($metadatum->get_id()); $this->assertTrue($newMetadatum->validate(), 'You can add a category metadatum inside a not multiple compound metadatum'); @@ -344,7 +344,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'meta', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Compound', + 'metadata_type' => 'Tainacan\Metadata_Types\Compound', 'status' => 'publish', 'multiple' => 'no' ), @@ -354,7 +354,7 @@ class CompoundMetadatumTypes extends TAINACAN_UnitTestCase { $newMetadatum = new \Tainacan\Entities\Metadatum(); $newMetadatum->set_name('test_multiple'); $newMetadatum->set_multiple('yes'); - $newMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Text'); + $newMetadatum->set_metadata_type('Tainacan\Metadata_Types\Text'); $newMetadatum->set_parent($metadatum->get_id()); $this->assertFalse($newMetadatum->validate(), 'You cant add a multiple metadatum inside a compound metadatum'); diff --git a/tests/test-core-metadatum-types.php b/tests/test-core-metadatum-types.php index eabd0f592..dfeb730bd 100644 --- a/tests/test-core-metadatum-types.php +++ b/tests/test-core-metadatum-types.php @@ -16,7 +16,7 @@ use Tainacan\Entities; class CoreMetadatumTypes extends TAINACAN_UnitTestCase { - function test_core_metadatum_types() { + function test_core_metadata_types() { $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); $Tainacan_Items = \Tainacan\Repositories\Items::get_instance(); @@ -35,7 +35,7 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'metadado', 'description' => 'title', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Title' + 'metadata_type' => 'Tainacan\Metadata_Types\Core_Title' ), true ); @@ -46,7 +46,7 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'metadado_desc', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Core_Description' + 'metadata_type' => 'Tainacan\Metadata_Types\Core_Description' ), true ); @@ -120,7 +120,7 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ; foreach ( $metadata as $index => $metadatum ){ - if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'title') { + if ( $metadatum->get_metadata_type_object()->get_core() && $metadatum->get_metadata_type_object()->get_related_mapped_prop() == 'title') { $core_title = $metadatum; } } @@ -155,10 +155,10 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { $metadata = $Tainacan_Metadata->fetch_by_collection( $collection, [], 'OBJECT' ) ; foreach ( $metadata as $index => $metadatum ){ - if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'title') { + if ( $metadatum->get_metadata_type_object()->get_core() && $metadatum->get_metadata_type_object()->get_related_mapped_prop() == 'title') { $core_title = $metadatum; } - if ( $metadatum->get_metadatum_type_object()->get_core() && $metadatum->get_metadatum_type_object()->get_related_mapped_prop() == 'description') { + if ( $metadatum->get_metadata_type_object()->get_core() && $metadatum->get_metadata_type_object()->get_related_mapped_prop() == 'description') { $core_description = $metadatum; } } @@ -189,7 +189,7 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { 'name' => 'just to confuse', 'description' => 'description', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text' + 'metadata_type' => 'Tainacan\Metadata_Types\Text' ), true ); @@ -198,16 +198,16 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase { $this->assertEquals(2, sizeof($core_metadata)); - $this->assertNotEquals('Tainacan\Metadatum_Types\Text', $core_metadata[0]->get_metadatum_type()); - $this->assertNotEquals('Tainacan\Metadatum_Types\Text', $core_metadata[1]->get_metadatum_type()); + $this->assertNotEquals('Tainacan\Metadata_Types\Text', $core_metadata[0]->get_metadata_type()); + $this->assertNotEquals('Tainacan\Metadata_Types\Text', $core_metadata[1]->get_metadata_type()); $title = $collection->get_core_title_metadatum(); - $this->assertEquals('Tainacan\Metadatum_Types\Core_Title', $title->get_metadatum_type()); + $this->assertEquals('Tainacan\Metadata_Types\Core_Title', $title->get_metadata_type()); $description = $collection->get_core_description_metadatum(); - $this->assertEquals('Tainacan\Metadatum_Types\Core_Description', $description->get_metadatum_type()); + $this->assertEquals('Tainacan\Metadata_Types\Core_Description', $description->get_metadata_type()); } diff --git a/tests/test-filters.php b/tests/test-filters.php index 78649676c..284ea958b 100644 --- a/tests/test-filters.php +++ b/tests/test-filters.php @@ -59,7 +59,7 @@ class Filters extends TAINACAN_UnitTestCase { array( 'name' => 'metadado', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'description' => 'descricao', ), true @@ -125,7 +125,7 @@ class Filters extends TAINACAN_UnitTestCase { array( 'name' => 'Other filtered', 'description' => 'Is filtered', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'collection_id' => $collection->get_id() ), true diff --git a/tests/test-item-metadata.php b/tests/test-item-metadata.php index 57f40a19c..b999ca1c9 100644 --- a/tests/test-item-metadata.php +++ b/tests/test-item-metadata.php @@ -36,7 +36,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase { 'name' => 'metadado', 'description' => 'descricao', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -90,7 +90,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase { 'description' => 'descricao', 'collection' => $collection, 'required' => 'yes', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -144,7 +144,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase { 'description' => 'descricao', 'collection' => $collection, 'collection_key' => 'yes', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -212,7 +212,7 @@ class Item_Metadata extends TAINACAN_UnitTestCase { 'description' => 'descricao', 'collection' => $collection, 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); diff --git a/tests/test-items.php b/tests/test-items.php index 42bb04c63..c2d4d817d 100644 --- a/tests/test-items.php +++ b/tests/test-items.php @@ -98,7 +98,7 @@ class Items extends TAINACAN_UnitTestCase { 'name' => 'metadado', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -109,7 +109,7 @@ class Items extends TAINACAN_UnitTestCase { 'name' => 'metadado2', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -120,7 +120,7 @@ class Items extends TAINACAN_UnitTestCase { 'name' => 'metadado3', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); diff --git a/tests/test-metadata.php b/tests/test-metadata.php index 23d26ddab..d6c3a9786 100644 --- a/tests/test-metadata.php +++ b/tests/test-metadata.php @@ -1,7 +1,7 @@ 'descricao', 'collection' => $collection, 'accept_suggestion' => true, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -68,7 +68,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'metadado', 'description' => 'descricao', 'collection_id' => $collection->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -77,8 +77,8 @@ class Metadata extends TAINACAN_UnitTestCase { $this->assertEquals($test->get_name(), 'metadado'); $this->assertEquals($test->get_collection_id(), $collection->get_id()); - $this->assertEquals('Tainacan\Metadatum_Types\Text', $test->get_metadatum_type()); - $this->assertEquals($test->get_metadatum_type(), 'Tainacan\Metadatum_Types\Text'); + $this->assertEquals('Tainacan\Metadata_Types\Text', $test->get_metadata_type()); + $this->assertEquals($test->get_metadata_type(), 'Tainacan\Metadata_Types\Text'); } /** @@ -92,7 +92,7 @@ class Metadata extends TAINACAN_UnitTestCase { array( 'name' => 'metadatum default', 'collection_id' => $Tainacan_Metadata->get_default_metadata_attribute(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -111,7 +111,7 @@ class Metadata extends TAINACAN_UnitTestCase { array( 'name' => 'metadatum grandfather', 'collection_id' => $collection_grandfather->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -131,7 +131,7 @@ class Metadata extends TAINACAN_UnitTestCase { array( 'name' => 'metadatum father', 'collection_id' => $collection_father->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -154,7 +154,7 @@ class Metadata extends TAINACAN_UnitTestCase { array( 'name' => 'metadatum son', 'collection_id' => $collection_son->get_id(), - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -192,9 +192,9 @@ class Metadata extends TAINACAN_UnitTestCase { /** * test if the defaults types are registered */ - function test_metadata_metadatum_type(){ + function test_metadata_metadata_type(){ $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); - $this->assertEquals( 8, sizeof( $Tainacan_Metadata->fetch_metadatum_types() ) ); + $this->assertEquals( 8, sizeof( $Tainacan_Metadata->fetch_metadata_types() ) ); } @@ -219,7 +219,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'metadatum1', 'description' => 'descricao', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -231,7 +231,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'metadatum2', 'description' => 'metadatum2', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -244,7 +244,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'metadatum3', 'description' => 'metadatum3', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', 'status' => 'publish' ), true @@ -278,7 +278,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'description' => 'adasdasdsa', 'slug' => 'duplicated_slug', 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -290,7 +290,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'description' => 'adasdasdsa', 'slug' => 'duplicated_slug', 'status' => 'publish', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -304,7 +304,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'teste', 'description' => 'adasdasdsa', 'slug' => 'duplicated_slug', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -315,7 +315,7 @@ class Metadata extends TAINACAN_UnitTestCase { 'name' => 'teste', 'description' => 'adasdasdsa', 'slug' => 'duplicated_slug', - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -334,7 +334,7 @@ class Metadata extends TAINACAN_UnitTestCase { } - function test_validation_of_metadatum_types() { + function test_validation_of_metadata_types() { $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $collection = $this->tainacan_entity_factory->create_entity( @@ -350,8 +350,8 @@ class Metadata extends TAINACAN_UnitTestCase { $validMetadatum->set_name('test'); $validMetadatum->set_description('test'); $validMetadatum->set_collection($collection); - $validMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Relationship'); - $validMetadatum->set_metadatum_type_options(['collection_id' => 12]); + $validMetadatum->set_metadata_type('Tainacan\Metadata_Types\Relationship'); + $validMetadatum->set_metadata_type_options(['collection_id' => 12]); $this->assertTrue($validMetadatum->validate()); @@ -360,8 +360,8 @@ class Metadata extends TAINACAN_UnitTestCase { $invalidMetadatum->set_description('test'); $invalidMetadatum->set_collection($collection); $invalidMetadatum->set_status('publish'); - $invalidMetadatum->set_metadatum_type('Tainacan\Metadatum_Types\Relationship'); - $invalidMetadatum->set_metadatum_type_options(['collection_id' => 'string']); + $invalidMetadatum->set_metadata_type('Tainacan\Metadata_Types\Relationship'); + $invalidMetadatum->set_metadata_type_options(['collection_id' => 'string']); $this->assertFalse($invalidMetadatum->validate()); @@ -371,7 +371,7 @@ class Metadata extends TAINACAN_UnitTestCase { /** * Class TainacanMetadatumType */ -class RandomType extends Metadatum_Types\Metadatum_Type { +class RandomType extends Metadata_Types\Metadata_Type { function __construct(){ parent::__construct(); diff --git a/tests/test-objects.php b/tests/test-objects.php index de7bc8eaa..3b7aa9fc2 100644 --- a/tests/test-objects.php +++ b/tests/test-objects.php @@ -51,7 +51,7 @@ class Objects extends TAINACAN_UnitTestCase { 'name' => 'metadado', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -62,7 +62,7 @@ class Objects extends TAINACAN_UnitTestCase { 'name' => 'metadado2', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true ); @@ -73,7 +73,7 @@ class Objects extends TAINACAN_UnitTestCase { 'name' => 'metadado3', 'status' => 'publish', 'collection' => $collection, - 'metadatum_type' => 'Tainacan\Metadatum_Types\Text', + 'metadata_type' => 'Tainacan\Metadata_Types\Text', ), true );