Merge branch 'release/0.13' of https://github.com/tainacan/tainacan into release/0.13
This commit is contained in:
commit
eb9b18565c
|
@ -12,7 +12,7 @@
|
||||||
:options="getOptions(0)"/>
|
:options="getOptions(0)"/>
|
||||||
<a
|
<a
|
||||||
class="add-new-term"
|
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"
|
terms.length < totalTerms"
|
||||||
@click="openCheckboxModal()">
|
@click="openCheckboxModal()">
|
||||||
{{ $i18n.get('label_view_all') }}
|
{{ $i18n.get('label_view_all') }}
|
||||||
|
@ -47,14 +47,12 @@
|
||||||
this.taxonomy_id = metadata_type_options.taxonomy_id;
|
this.taxonomy_id = metadata_type_options.taxonomy_id;
|
||||||
this.taxonomy = metadata_type_options.taxonomy;
|
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.allowNew = metadata_type_options.allow_new_terms == 'yes';
|
||||||
}
|
|
||||||
|
|
||||||
// This condition is temporary
|
// This condition is temporary, used by bulk edition modal
|
||||||
if(this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input'){
|
if (this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input')
|
||||||
this.getTermsFromTaxonomy();
|
this.getTermsFromTaxonomy();
|
||||||
}
|
|
||||||
|
|
||||||
this.getTermsId();
|
this.getTermsId();
|
||||||
},
|
},
|
||||||
|
@ -80,7 +78,6 @@
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
valueComponent( val ){
|
valueComponent( val ){
|
||||||
this.valueComponent = val;
|
|
||||||
this.$emit('input', val);
|
this.$emit('input', val);
|
||||||
this.$emit('blur');
|
this.$emit('blur');
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,11 +112,10 @@
|
||||||
let val = this.selected;
|
let val = this.selected;
|
||||||
let results = [];
|
let results = [];
|
||||||
|
|
||||||
if (val.length > 0){
|
if (val.length > 0) {
|
||||||
for( let term of val ){
|
for (let term of val)
|
||||||
results.push( term.value );
|
results.push( term.value );
|
||||||
}
|
|
||||||
|
|
||||||
this.$emit('input', results);
|
this.$emit('input', results);
|
||||||
this.$emit('blur');
|
this.$emit('blur');
|
||||||
}
|
}
|
||||||
|
@ -125,9 +124,8 @@
|
||||||
let val = this.selected;
|
let val = this.selected;
|
||||||
let results = [];
|
let results = [];
|
||||||
|
|
||||||
for( let term of val ){
|
for (let term of val)
|
||||||
results.push( term.value );
|
results.push(term.value);
|
||||||
}
|
|
||||||
|
|
||||||
this.$emit('input', results);
|
this.$emit('input', results);
|
||||||
this.$emit('blur');
|
this.$emit('blur');
|
||||||
|
|
Loading…
Reference in New Issue