diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue index 7579f620c..318bf8a73 100644 --- a/src/admin/components/lists/items-list.vue +++ b/src/admin/components/lists/items-list.vue @@ -26,18 +26,17 @@ v-for="(column, index) in tableFields" :key="index" :custom-key="column.slug" - :label="column.label" + :label="column.name" :visible="column.visible" :width="column.field == 'row_actions' ? 78 : column.field == 'featured_image' ? 55 : undefined "> - - - + - + @@ -179,20 +178,14 @@ export default { goToItemEditPage(itemId) { this.$router.push(this.$routerHelper.getItemEditPath(this.collectionId, itemId)); }, - showValue( metadata ){ + renderMetadata( metadata ){ - if( ! metadata || metadata.value === false || metadata.value == undefined || metadata.value == '' ) + if( ! metadata || metadata.value === false || metadata.value == undefined ) return ''; - - if( metadata.value instanceof Array ){ - let result = []; - for( let val of metadata.value ){ - result.push( ( val.name ) ? val.name : val ) - } - return result.join(', '); - } else { - return metadata.value.name ? metadata.value.name : metadata.value - } + else if (metadata) + return metadata.value_as_html; + else + return metadata.value_as_html; } } } diff --git a/src/admin/components/search/search-control.vue b/src/admin/components/search/search-control.vue index 01c21c88e..ecbccef72 100644 --- a/src/admin/components/search/search-control.vue +++ b/src/admin/components/search/search-control.vue @@ -14,7 +14,6 @@ class="control" custom> {{ column.label }} @@ -29,10 +28,10 @@ :placeholder="$i18n.get('label_sorting')">