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

Show error messages and improve select to create (#18)

This commit is contained in:
weryques 2018-08-29 12:39:16 -03:00
parent f188d4c04f
commit 7d0d04e490
3 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/admin/components/bulk-edition/bulk-edition-modal.vue
View File

@ -80,7 +80,9 @@
:forced-component-type="getMetadataByID(bulkEditionProcedures[criterion].metadatumID)
.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
:allow-new="false"
:allow-select-to-create="true"
:allow-select-to-create="getMetadataByID(bulkEditionProcedures[criterion].metadatumID)
.metadata_type_options.allow_new_terms === 'yes'"
:maxtags="1"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
:disabled="bulkEditionProcedures[criterion].isDone"
:id="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component +
@ -133,7 +135,9 @@
:forced-component-type="getMetadataByID(bulkEditionProcedures[criterion].metadatumID)
.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
:allow-new="false"
:allow-select-to-create="true"
:allow-select-to-create="getMetadataByID(bulkEditionProcedures[criterion].metadatumID)
.metadata_type_options.allow_new_terms === 'yes'"
:maxtags="1"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
:disabled="bulkEditionProcedures[criterion].isDone"
:id="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component +
@ -166,16 +170,24 @@
<div
v-if="bulkEditionProcedures[criterion].isDone"
class="is-pulled-right">
<b-icon
type="is-success"
icon="check-circle"/>
<b-tooltip
class="is-success"
:label="actionResult.constructor.name !== 'Object' && actionResult === 1 ? `${actionResult} ${$i18n.get('info_item_edited')}` : `${actionResult} ${$i18n.get('info_items_edited')}`">
<b-icon
type="is-success"
icon="check-circle"/>
</b-tooltip>
</div>
<div
v-if="bulkEditionProcedures[criterion].isDoneWithError && !bulkEditionProcedures[criterion].isExecuting"
class="is-pulled-right">
<b-icon
type="is-danger"
icon="alert-circle"/>
<b-tooltip
class="is-danger"
:label="actionResult.constructor.name === 'Object' ? (actionResult.error_message ? actionResult.error_message : actionResult.message) : ''">
<b-icon
type="is-danger"
icon="alert-circle"/>
</b-tooltip>
</div>
<button
v-if="!bulkEditionProcedures[criterion].isDone &&
@ -215,7 +227,7 @@
</a>
</button>
</div>
<pre>{{ bulkEditionProcedures }}</pre>
<!--<pre>{{ bulkEditionProcedures }}</pre>-->
<footer class="field form-submit">
<div class="control is-pulled-right">
@ -278,7 +290,8 @@
},
groupID: null,
dones: [false],
totalItemsEditedWithSuccess: 0
totalItemsEditedWithSuccess: 0,
actionResult: '',
}
},
methods: {
@ -317,13 +330,17 @@
groupID: this.groupID,
bodyParams: { value: procedure.newValue }
}).then(() => {
let actionResult = this.getActionResult();
this.actionResult = this.getActionResult();
if(this.actionResult.constructor.name === 'Object' &&
(this.actionResult.data &&
this.actionResult.data.status.toString().split('')[0] != 2) ||
this.actionResult.error_message) {
if(actionResult.constructor.name === 'Object' && actionResult.data.status.toString().split('')[0] != 2 ) {
this.finalizeProcedure(criterion, true);
} else {
this.finalizeProcedure(criterion);
this.totalItemsEditedWithSuccess = actionResult;
this.totalItemsEditedWithSuccess = this.actionResult;
}
});
} else {
@ -335,13 +352,17 @@
value: procedure.newValue
}
}).then(() => {
let actionResult = this.getActionResult();
this.actionResult = this.getActionResult();
if(this.actionResult.constructor.name === 'Object' &&
(this.actionResult.data &&
this.actionResult.data.status.toString().split('')[0] != 2) ||
this.actionResult.error_message) {
if(actionResult.constructor.name === 'Object' && actionResult.data.status.toString().split('')[0] != 2 ) {
this.finalizeProcedure(criterion, true);
} else {
this.finalizeProcedure(criterion);
this.totalItemsEditedWithSuccess = actionResult;
this.totalItemsEditedWithSuccess = this.actionResult;
}
});
}
@ -356,13 +377,17 @@
value: procedure.newValue,
}
}).then(() => {
let actionResult = this.getActionResult();
this.actionResult = this.getActionResult();
if(this.actionResult.constructor.name === 'Object' &&
(this.actionResult.data &&
this.actionResult.data.status.toString().split('')[0] != 2) ||
this.actionResult.error_message) {
if(actionResult.constructor.name === 'Object' && actionResult.data.status.toString().split('')[0] != 2 ) {
this.finalizeProcedure(criterion, true);
} else {
this.finalizeProcedure(criterion);
this.totalItemsEditedWithSuccess = actionResult;
this.totalItemsEditedWithSuccess = this.actionResult;
}
});
} else if(procedure.action === this.editionActionsForMultiple.replace){
@ -377,13 +402,17 @@
new_value: procedure.newValue,
}
}).then(() => {
let actionResult = this.getActionResult();
this.actionResult = this.getActionResult();
if(this.actionResult.constructor.name === 'Object' &&
(this.actionResult.data &&
this.actionResult.data.status.toString().split('')[0] != 2) ||
this.actionResult.error_message) {
if(actionResult.constructor.name === 'Object' && actionResult.data.status.toString().split('')[0] != 2 ) {
this.finalizeProcedure(criterion, true);
} else {
this.finalizeProcedure(criterion);
this.totalItemsEditedWithSuccess = actionResult;
this.totalItemsEditedWithSuccess = this.actionResult;
}
});
} else if(procedure.action === this.editionActionsForMultiple.remove){
@ -397,13 +426,17 @@
value: procedure.newValue,
}
}).then(() => {
let actionResult = this.getActionResult();
this.actionResult = this.getActionResult();
if(this.actionResult.constructor.name === 'Object' &&
(this.actionResult.data &&
this.actionResult.data.status.toString().split('')[0] != 2) ||
this.actionResult.error_message) {
if(actionResult.constructor.name === 'Object' && actionResult.data.status.toString().split('')[0] != 2 ) {
this.finalizeProcedure(criterion, true);
} else {
this.finalizeProcedure(criterion);
this.totalItemsEditedWithSuccess = actionResult;
this.totalItemsEditedWithSuccess = this.actionResult;
}
});
}
@ -525,6 +558,7 @@
.tags {
color: black !important;
background-color: white !important;
border: none !important;
.tag.is-delete {
display: none !important;
@ -533,6 +567,10 @@
.tag {
max-width: 100% !important;
}
&:hover {
background-color: white !important;
}
}
.icon {

2
src/admin/tainacan-admin-i18n.php
View File

@ -429,6 +429,8 @@ return apply_filters( 'tainacan-admin-i18n', [
'info_editing_items_in_bulk' => __( 'Editing items in bulk', 'tainacan' ),
'info_by_inner' => __( 'by', 'tainacan' ),
'info_items_selected' => __( 'items selected', 'tainacan' ),
'info_items_edited' => __( 'items edited', 'tainacan' ),
'info_item_edited' => __( 'item edited', 'tainacan'),
'info_no_parent_term_found' => __( 'No valid parent term was found with this name.', 'tainacan' ),
'info_warning_changing_parent_term' => __( 'Warning! Changing parent term will reload the terms list, thus uncheking any selection.', 'tainacan' ),

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

@ -5,7 +5,7 @@
size="is-small"
icon="magnify"
:allow-new="allowNew"
:maxtags="!allowNew ? 1 : ''"
:maxtags="maxtags"
@add="emitAdd"
@remove="emitRemove"
v-model="selected"
@ -32,6 +32,14 @@
isFetching: false,
}
},
watch: {
selected(){
if(this.allowSelectToCreate && this.selected[0]){
this.selected[0].label.includes(`(${this.$i18n.get('select_to_create')})`);
this.selected[0].label = this.selected[0].label.split('(')[0];
}
}
},
props: {
options: {
type: Array
@ -41,6 +49,7 @@
taxonomyId: Number,
disabled: false,
allowSelectToCreate: false,
maxtags: '',
},
created(){
if(this.value && this.value.length > 0){