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

Merge branch 'release/0.13' of https://github.com/tainacan/tainacan into release/0.13

This commit is contained in:
vnmedeiros 2019-10-22 14:30:04 -03:00
parent 94529922fe 44337f4d99
commit eb9b18565c
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/classes/metadata-types/taxonomy/Taxonomy.vue
View File

@ -12,7 +12,7 @@
:options="getOptions(0)"/>
<a
class="add-new-term"
v-if="(this.getComponent == 'tainacan-taxonomy-checkbox' || this.getComponent == 'tainacan-taxonomy-radio') &&
v-if="(getComponent == 'tainacan-taxonomy-checkbox' || getComponent == 'tainacan-taxonomy-radio') &&
terms.length < totalTerms"
@click="openCheckboxModal()">
{{ $i18n.get('label_view_all') }}
@ -47,14 +47,12 @@
this.taxonomy_id = metadata_type_options.taxonomy_id;
this.taxonomy = metadata_type_options.taxonomy;
if( metadata_type_options && metadata_type_options.allow_new_terms && this.metadatum.item ){
if (metadata_type_options && metadata_type_options.allow_new_terms && this.metadatum.item)
this.allowNew = metadata_type_options.allow_new_terms == 'yes';
}
// This condition is temporary
if(this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input'){
// This condition is temporary, used by bulk edition modal
if (this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input')
this.getTermsFromTaxonomy();
}
this.getTermsId();
},
@ -80,7 +78,6 @@
},
watch: {
valueComponent( val ){
this.valueComponent = val;
this.$emit('input', val);
this.$emit('blur');
}

6
src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
View File

@ -113,9 +113,8 @@
let results = [];
if (val.length > 0) {
for( let term of val ){
for (let term of val)
results.push( term.value );
}
this.$emit('input', results);
this.$emit('blur');
@ -125,9 +124,8 @@
let val = this.selected;
let results = [];
for( let term of val ){
for (let term of val)
results.push(term.value);
}
this.$emit('input', results);
this.$emit('blur');