Updates to receive new 'default_section' and 'metadata_object_list'. #…

…184.
tainacan · May 13, 2022 · 7eac8c1 · 7eac8c1
1 parent a6b72d1
commit 7eac8c1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php
@@ -577,7 +577,7 @@ public function get_metadata_as_html($args = array()) {
 			'hide_empty' 			=> true,
 			'empty_value_message' 	=> '',
 			'display_slug_as_class' => false,
-			'before' 				=> '<div class="metadata-type-$type $id">',
+			'before' 				=> '<div class="metadata-type-$type" $id>',
 			'after' 				=> '</div>',
 			'before_title' 			=> '<h3>',
 			'after_title' 			=> '</h3>',
@@ -738,7 +738,7 @@ public function get_item_metadatum_as_html($item_metadatum, $args = array(), $me
 			'hide_empty' 			=> true,
 			'empty_value_message' 	=> '',
 			'display_slug_as_class' => false,
-			'before' 				=> '<div class="metadata-type-$type" $id">',
+			'before' 				=> '<div class="metadata-type-$type" $id>',
 			'after' 				=> '</div>',
 			'before_title' 			=> '<h3>',
 			'after_title' 			=> '</h3>',
@@ -1173,7 +1173,7 @@ public function get_metadata_section_as_html($metadata_section, $args = array(),
 		$args = wp_parse_args($args, $defaults);
 
 		// Gets the metadata section inner metadata list
-		$metadata_section_metadata_list = $metadata_section->get_metadata_list();
+		$metadata_section_metadata_list = $metadata_section->get_metadata_object_list();
 		$has_metadata_list = (is_array($metadata_section_metadata_list) && count($metadata_section_metadata_list) > 0 );
 
 		if ( $has_metadata_list || !$args['hide_empty'] ) {
@@ -1247,8 +1247,9 @@ public function get_metadata_section_as_html($metadata_section, $args = array(),
 			$return .= $before_metadata_list;
 
 			// Renders the section metadata list, using Items' get_metadata_as_html()
-			$return .= ( $has_metadata_list ? $this->get_metadata_as_html( wp_parse_args($args['metadata_list_args'], [ 'metadata__in' => $metadata_section_metadata_list]) ) : $args['empty_metadata_list_message'] );
-
+			foreach( $metadata_section_metadata_list as $metadata_object) {
+				$return .= ( $has_metadata_list ? $this->get_metadata_as_html( wp_parse_args($args['metadata_list_args'], [ 'metadata' => $metadata_object]) ) : $args['empty_metadata_list_message'] );
+			}
 			// Gets the wrapper closer
 			$after_metadata_list = $args['after_metadata_list'];
 

diff --git a/src/views/admin/components/lists/collection-metadata-list.vue b/src/views/admin/components/lists/collection-metadata-list.vue
@@ -157,9 +157,19 @@
                             <h3>{{ metadataSection.name }}</h3>
                         </span>
                         <span   
-                                v-if="metadataSection.id != undefined && metadataSection.core"
-                                class="label-details">
-                            ({{ $i18n.get('label_core_section') }}) 
+                                v-if="metadataSection.id != undefined"
+                                class="label-details"
+                                :class="{ 'has-text-weight-bold': metadataSection.id === 'default_section' }">
+                            <span 
+                                    v-if="metadataSection.id === 'default_section'"
+                                    v-tooltip="{
+                                        content: $i18n.get('label_required'),
+                                        autoHide: true,
+                                        popperClass: ['tainacan-tooltip', 'tooltip', 'tainacan-repository-tooltip'],
+                                        placement: 'auto-start'
+                                    }">
+                                *&nbsp;({{ $i18n.get('label_default_section') }}) 
+                            </span>
                             <span 
                                     v-if="metadataSection.status === 'private'"
                                     class="icon"
@@ -204,7 +214,7 @@
                             <a 
                                     v-if="metadataSection.current_user_can_delete"
                                     :disabled="metadataSection.metadata_object_list.length"
-                                    :style="{ visibility: metadataSection.collection_id != collectionId || metadataSection.core || metadataSection.metadata_object_list.length ? 'hidden' : 'visible' }"
+                                    :style="{ visibility: metadataSection.collection_id != collectionId || metadataSection.id === 'default_section' || metadataSection.metadata_object_list.length ? 'hidden' : 'visible' }"
                                     @click.prevent="removeMetadataSection(metadataSection)">
                                 <span
                                         v-tooltip="{
@@ -339,7 +349,7 @@
                                                 }">
                                             *&nbsp;
                                         </span>
-                                        ({{ metadatum.metadata_type_object.name }} {{ metadatum.metadata_section_id }}) 
+                                        ({{ metadatum.metadata_type_object.name }}) 
                                         <span 
                                                 v-if="metadatum.status === 'private'"
                                                 class="icon"

diff --git a/src/views/tainacan-i18n.php b/src/views/tainacan-i18n.php
@@ -252,7 +252,7 @@
 	/* translators: 'Core' as in 'main' - the most important and default description */
 	'label_core_description'                         => __( 'Core Description', 'tainacan' ),
 	/* translators: 'Core' as in 'main' - the most important and default section */
-	'label_core_section'                             => __( 'Core Section', 'tainacan' ),
+	'label_default_section'                             => __( 'Default Section', 'tainacan' ),
 	/* translators: noun, not the verb. This comes after options to be sorted by */
 	'label_sorting'                                  => __( 'Sorting', 'tainacan' ),
 	/* translators: noun, not the verb. This comes after options 'ASC' and 'DESC' */