tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/0.16.2' of https://github.com/tainacan/tainacan into hotfix/0.16.2

This commit is contained in:
vnmedeiros 2020-06-11 12:22:37 -03:00
parent b8b117147a fc10df8ace
commit 8721ff1238
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/classes/entities/class-tainacan-item.php
View File

@ -622,9 +622,6 @@ class Item extends Entity {
$fto = $item_meta->get_metadatum()->get_metadata_type_object(); $fto = $item_meta->get_metadatum()->get_metadata_type_object();
$before = str_replace('$type', $fto->get_slug(), $args['before']);
$return .= $before;
if ( $fto->get_core() ) { if ( $fto->get_core() ) {
if ( $args['exclude_core'] ) { if ( $args['exclude_core'] ) {
continue; continue;
@ -635,6 +632,9 @@ class Item extends Entity {
} }
} }
$before = str_replace('$type', $fto->get_slug(), $args['before']);
$return .= $before;
if ($item_meta->has_value() || !$args['hide_empty']) { if ($item_meta->has_value() || !$args['hide_empty']) {
$return .= $args['before_title'] . $item_meta->get_metadatum()->get_name() . $args['after_title']; $return .= $args['before_title'] . $item_meta->get_metadatum()->get_name() . $args['after_title'];
$return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value']; $return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value'];

1
src/views/admin/components/filter-types/taxonomy/Checkbox.vue
View File

@ -193,7 +193,6 @@
this.selected = metadata.terms; this.selected = metadata.terms;
} else { } else {
this.selected = []; this.selected = [];
return false;
} }
let onlyLabels = []; let onlyLabels = [];