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

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

This commit is contained in:
vnmedeiros 2020-04-22 16:54:25 -03:00
parent 80eb372037 fd9409ee18
commit 006594d2de
19 changed files with 255 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/admin/components/edition/item-bulk-edition-form.vue
View File

@ -237,9 +237,7 @@ export default {
'updateItemDocument', 'updateItemDocument',
]), ]),
...mapActions('bulkedition', [ ...mapActions('bulkedition', [
'createEditGroup', 'createSequenceEditGroup'
'createSequenceEditGroup',
'setStatusInBulk'
]), ]),
uploadFiles() { uploadFiles() {
@ -311,7 +309,7 @@ export default {
this.isCreatingSequenceEditGroup = true; this.isCreatingSequenceEditGroup = true;
this.createSequenceEditGroup({ this.createSequenceEditGroup({
object: onlyItemIds, object: onlyItemIds,
collectionID: this.collectionId collectionId: this.collectionId
}).then((group) => { }).then((group) => {
let sequenceId = group.id; let sequenceId = group.id;
this.isCreatingSequenceEditGroup = false; this.isCreatingSequenceEditGroup = false;
@ -330,7 +328,7 @@ export default {
totalItems: onlyItemIds.length, totalItems: onlyItemIds.length,
selectedForBulk: onlyItemIds, selectedForBulk: onlyItemIds,
objectType: this.$i18n.get('items'), objectType: this.$i18n.get('items'),
collectionID: this.collectionId collectionId: this.collectionId
}, },
width: 'calc(100% - (2 * var(--tainacan-one-column)))', width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true trapFocus: true

13
src/views/admin/components/edition/item-edition-form.vue
View File

@ -855,7 +855,11 @@ export default {
this.isLoading = true; this.isLoading = true;
// Obtains current Item ID from Sequence // Obtains current Item ID from Sequence
this.fetchItemIdInSequence({ collectionId: this.collectionId, sequenceId: this.sequenceId, itemPosition: this.itemPosition }) this.fetchItemIdInSequence({
collectionId: this.collectionId,
sequenceId: this.sequenceId,
itemPosition: this.itemPosition
})
.then(() => { .then(() => {
this.itemId = this.itemIdInSequence; this.itemId = this.itemIdInSequence;
this.loadExistingItem(); this.loadExistingItem();
@ -903,7 +907,11 @@ export default {
this.$userPrefs.set('sequence_' + this.sequenceId + '_position', this.itemPosition); this.$userPrefs.set('sequence_' + this.sequenceId + '_position', this.itemPosition);
// Obtains current Item ID from Sequence // Obtains current Item ID from Sequence
this.fetchItemIdInSequence({ collectionId: this.collectionId, sequenceId: this.sequenceId, itemPosition: this.itemPosition }) this.fetchItemIdInSequence({
collectionId: this.collectionId,
sequenceId: this.sequenceId,
itemPosition: this.itemPosition
})
.then(() => { .then(() => {
this.itemId = this.itemIdInSequence; this.itemId = this.itemIdInSequence;
this.loadExistingItem(); this.loadExistingItem();
@ -980,7 +988,6 @@ export default {
]), ]),
...mapActions('bulkedition', [ ...mapActions('bulkedition', [
'fetchItemIdInSequence', 'fetchItemIdInSequence',
'fetchGroup',
'fetchSequenceGroup' 'fetchSequenceGroup'
]), ]),
...mapGetters('bulkedition', [ ...mapGetters('bulkedition', [

36
src/views/admin/components/lists/items-list.vue
View File

@ -1007,7 +1007,7 @@ export default {
'untrashItemsInBulk' 'untrashItemsInBulk'
]), ]),
...mapGetters('bulkedition', [ ...mapGetters('bulkedition', [
'getGroupID' 'getGroupId'
]), ]),
...mapActions('item', [ ...mapActions('item', [
'fetchItem' 'fetchItem'
@ -1042,7 +1042,7 @@ export default {
totalItems: Object.keys(this.queryAllItemsSelected).length ? this.totalItems : this.selectedItems.length, totalItems: Object.keys(this.queryAllItemsSelected).length ? this.totalItems : this.selectedItems.length,
selectedForBulk: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems, selectedForBulk: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems,
objectType: this.$i18n.get('items'), objectType: this.$i18n.get('items'),
collectionID: this.$route.params.collectionId, collectionId: this.$route.params.collectionId,
}, },
width: 'calc(100% - (2 * var(--tainacan-one-column)))', width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true trapFocus: true
@ -1051,9 +1051,9 @@ export default {
sequenceEditSelectedItems() { sequenceEditSelectedItems() {
this.createSequenceEditGroup({ this.createSequenceEditGroup({
object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems, object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems,
collectionID: this.collectionId collectionId: this.collectionId
}).then(() => { }).then(() => {
let sequenceId = this.getGroupID(); let sequenceId = this.getGroupId();
this.$router.push(this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, sequenceId, 1)); this.$router.push(this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, sequenceId, 1));
}); });
}, },
@ -1101,14 +1101,14 @@ export default {
this.$emit('updateIsLoading', this.isLoading); this.$emit('updateIsLoading', this.isLoading);
this.createEditGroup({ this.createEditGroup({
collectionID: this.collectionId, collectionId: this.collectionId,
object: [itemId] object: [itemId]
}).then(() => { }).then(() => {
let groupID = this.getGroupID(); let groupId = this.getGroupId();
this.untrashItemsInBulk({ this.untrashItemsInBulk({
collectionID: this.collectionId, collectionId: this.collectionId,
groupID: groupID groupId: groupId
}).then(() => { }).then(() => {
this.$eventBusSearch.loadItems(); this.$eventBusSearch.loadItems();
}); });
@ -1155,14 +1155,14 @@ export default {
this.$emit('updateIsLoading', this.isLoading); this.$emit('updateIsLoading', this.isLoading);
this.createEditGroup({ this.createEditGroup({
collectionID: this.collectionId, collectionId: this.collectionId,
object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems
}).then(() => { }).then(() => {
let groupID = this.getGroupID(); let groupId = this.getGroupId();
this.untrashItemsInBulk({ this.untrashItemsInBulk({
collectionID: this.collectionId, collectionId: this.collectionId,
groupID: groupID groupId: groupId
}).then(() => { }).then(() => {
this.$eventBusSearch.loadItems(); this.$eventBusSearch.loadItems();
}); });
@ -1185,22 +1185,22 @@ export default {
this.$emit('updateIsLoading', this.isLoading); this.$emit('updateIsLoading', this.isLoading);
this.createEditGroup({ this.createEditGroup({
collectionID: this.collectionId, collectionId: this.collectionId,
object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems object: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItems
}).then(() => { }).then(() => {
let groupID = this.getGroupID(); let groupId = this.getGroupId();
if (this.isOnTrash) { if (this.isOnTrash) {
this.deleteItemsInBulk({ this.deleteItemsInBulk({
collectionID: this.collectionId, collectionId: this.collectionId,
groupID: groupID groupId: groupId
}).then(() => { }).then(() => {
this.$eventBusSearch.loadItems(); this.$eventBusSearch.loadItems();
}); });
} else { } else {
this.trashItemsInBulk({ this.trashItemsInBulk({
collectionID: this.collectionId, collectionId: this.collectionId,
groupID: groupID groupId: groupId
}).then(() => { }).then(() => {
this.$eventBusSearch.loadItems(); this.$eventBusSearch.loadItems();
}); });

2
src/views/admin/components/lists/terms-list.vue
View File

@ -510,7 +510,7 @@ export default {
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
max-width: 26px; max-width: 1.25em;
} }
} }

253
src/views/admin/components/modals/bulk-edition-modal.vue
View File

@ -24,17 +24,17 @@
<b-select <b-select
:loading="metadataIsLoading" :loading="metadataIsLoading"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatumID}" :class="{ 'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatum }"
:disabled="!!bulkEditionProcedures[criterion].metadatumID || metadataIsLoading" :disabled="!!bulkEditionProcedures[criterion].metadatum || metadataIsLoading"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last" class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
:placeholder="$i18n.get('instruction_select_a_metadatum')" :placeholder="$i18n.get('instruction_select_a_metadatum')"
@input="addToBulkEditionProcedures($event, 'metadatumID', criterion)"> @input="addToBulkEditionProcedures($event, 'metadatum', criterion)">
<template <template
v-for="(metadatum, index) in metadata"> v-for="(metadatum, index) in metadata">
<option <option
:key="index" :key="index"
v-if="metadatum.id && metadatum.metadata_type_object.component !== 'tainacan-compound' && metadatum.parent <= 0" v-if="metadatum.id && metadatum.metadata_type_object.component !== 'tainacan-compound' && metadatum.parent <= 0"
:value="metadatum.id"> :value="metadatum">
{{ metadatum.name }} {{ metadatum.name }}
</option> </option>
<optgroup <optgroup
@ -45,30 +45,32 @@
v-for="(childMetadatum, childIndex) of metadatum.metadata_type_options.children_objects" v-for="(childMetadatum, childIndex) of metadatum.metadata_type_options.children_objects"
:key="childIndex" :key="childIndex"
v-if="childMetadatum.id" v-if="childMetadatum.id"
:value="childMetadatum.id"> :value="childMetadatum">
{{ childMetadatum.name }} {{ childMetadatum.name }}
</option> </option>
</optgroup> </optgroup>
</template> </template>
<option value="status"> <option :value="{ id: 'status' }">
{{ $i18n.get('label_status') }} {{ $i18n.get('label_status') }}
</option> </option>
<option value="comments"> <option :value="{ id: 'comments' }">
{{ $i18n.get('label_allow_comments') }} {{ $i18n.get('label_allow_comments') }}
</option> </option>
<option :value="{ id: 'created_by' }">
{{ $i18n.get('label_created_by') }}
</option>
</b-select> </b-select>
<b-select <b-select
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].action }" :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].action }"
v-if="bulkEditionProcedures[criterion] && v-if="bulkEditionProcedures[criterion] && bulkEditionProcedures[criterion].metadatum"
bulkEditionProcedures[criterion].metadatumID"
:disabled="!!bulkEditionProcedures[criterion].action" :disabled="!!bulkEditionProcedures[criterion].action"
:value="bulkEditionProcedures[criterion].action ? bulkEditionProcedures[criterion].action : undefined" :value="bulkEditionProcedures[criterion].action ? bulkEditionProcedures[criterion].action : undefined"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last" class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
:placeholder="$i18n.get('instruction_select_a_action')" :placeholder="$i18n.get('instruction_select_a_action')"
@input="addToBulkEditionProcedures($event, 'action', criterion)"> @input="addToBulkEditionProcedures($event, 'action', criterion)">
<option <option
v-for="(edtAct, key) in getValidEditionActions(bulkEditionProcedures[criterion].metadatumID)" v-for="(edtAct, key) in getValidEditionActions(bulkEditionProcedures[criterion].metadatum)"
:value="edtAct" :value="edtAct"
:key="key"> :key="key">
{{ edtAct }} {{ edtAct }}
@ -85,14 +87,13 @@
<!-- Replace --> <!-- Replace -->
<template <template
v-if="bulkEditionProcedures[criterion] && v-if="bulkEditionProcedures[criterion] &&
bulkEditionProcedures[criterion].metadatumID && bulkEditionProcedures[criterion].metadatum &&
bulkEditionProcedures[criterion].action == editionActionsForMultiple.replace"> bulkEditionProcedures[criterion].action == editionActions.replace">
<component <component
:is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component" :is="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component"
:forced-component-type="getMetadataByID(bulkEditionProcedures[criterion].metadatumID) :forced-component-type="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''" :item-metadatum="{ metadatum: bulkEditionProcedures[criterion].metadatum }"
:item-metadatum="{ metadatum: getMetadataByID(bulkEditionProcedures[criterion].metadatumID) }"
:allow-new="false" :allow-new="false"
:allow-select-to-create="false" :allow-select-to-create="false"
:maxtags="1" :maxtags="1"
@ -109,13 +110,11 @@
</div> </div>
<component <component
:is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component" :is="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component"
:forced-component-type="getMetadataByID(bulkEditionProcedures[criterion].metadatumID) :forced-component-type="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''" :item-metadatum="{ metadatum: bulkEditionProcedures[criterion].metadatum }"
:item-metadatum="{ metadatum: getMetadataByID(bulkEditionProcedures[criterion].metadatumID) }"
:allow-new="false" :allow-new="false"
:allow-select-to-create="getMetadataByID(bulkEditionProcedures[criterion].metadatumID) :allow-select-to-create="bulkEditionProcedures[criterion].metadatum.metadata_type_options.allow_new_terms === 'yes'"
.metadata_type_options.allow_new_terms === 'yes'"
:maxtags="1" :maxtags="1"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone}" :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last" class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
@ -126,8 +125,7 @@
<!-- Not replace --> <!-- Not replace -->
<template <template
v-else-if="bulkEditionProcedures[criterion] && v-else-if="bulkEditionProcedures[criterion] && bulkEditionProcedures[criterion].metadatum && bulkEditionProcedures[criterion].metadatum.id == 'status'">
bulkEditionProcedures[criterion].metadatumID == 'status'">
<b-select <b-select
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}" :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}"
:disabled="bulkEditionProcedures[criterion].isDone" :disabled="bulkEditionProcedures[criterion].isDone"
@ -144,8 +142,7 @@
</template> </template>
<template <template
v-else-if="bulkEditionProcedures[criterion] && v-else-if="bulkEditionProcedures[criterion] && bulkEditionProcedures[criterion].metadatum && bulkEditionProcedures[criterion].metadatum.id == 'comments'">
bulkEditionProcedures[criterion].metadatumID == 'comments'">
<b-select <b-select
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}" :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}"
:disabled="bulkEditionProcedures[criterion].isDone" :disabled="bulkEditionProcedures[criterion].isDone"
@ -163,9 +160,9 @@
<template <template
v-else-if="bulkEditionProcedures[criterion] && v-else-if="bulkEditionProcedures[criterion] &&
bulkEditionProcedures[criterion].metadatumID && bulkEditionProcedures[criterion].metadatum &&
bulkEditionProcedures[criterion].action && bulkEditionProcedures[criterion].action &&
bulkEditionProcedures[criterion].action == editionActionsForMultiple.copy"> bulkEditionProcedures[criterion].action == editionActions.copy">
<b-select <b-select
:loading="metadataIsLoading" :loading="metadataIsLoading"
:class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatumIdCopyFrom }" :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatumIdCopyFrom }"
@ -174,7 +171,7 @@
:placeholder="$i18n.get('instruction_select_a_metadatum')" :placeholder="$i18n.get('instruction_select_a_metadatum')"
@input="addToBulkEditionProcedures($event, 'metadatumIdCopyFrom', criterion)"> @input="addToBulkEditionProcedures($event, 'metadatumIdCopyFrom', criterion)">
<template <template
v-for="(metadatum, index) in metadata"> v-for="(metadatum, index) in getAllowedMetadataForCopy(criterion)">
<option <option
:key="index" :key="index"
v-if="metadatum.id && metadatum.metadata_type_object.component !== 'tainacan-compound' && metadatum.parent <= 0" v-if="metadatum.id && metadatum.metadata_type_object.component !== 'tainacan-compound' && metadatum.parent <= 0"
@ -200,17 +197,15 @@
<template <template
v-else-if="bulkEditionProcedures[criterion] && v-else-if="bulkEditionProcedures[criterion] &&
bulkEditionProcedures[criterion].metadatumID && bulkEditionProcedures[criterion].metadatum &&
bulkEditionProcedures[criterion].action && bulkEditionProcedures[criterion].action &&
bulkEditionProcedures[criterion].action != editionActionsForMultiple.clear"> bulkEditionProcedures[criterion].action != editionActions.clear">
<component <component
:is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component" :is="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component"
:forced-component-type="getMetadataByID(bulkEditionProcedures[criterion].metadatumID) :forced-component-type="bulkEditionProcedures[criterion].metadatum.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''"
.metadata_type_object.component.includes('taxonomy') ? 'tainacan-taxonomy-tag-input' : ''" :item-metadatum="{ metadatum: bulkEditionProcedures[criterion].metadatum }"
:item-metadatum="{ metadatum: getMetadataByID(bulkEditionProcedures[criterion].metadatumID) }"
:allow-new="false" :allow-new="false"
:allow-select-to-create="getMetadataByID(bulkEditionProcedures[criterion].metadatumID) :allow-select-to-create="bulkEditionProcedures[criterion].metadatum.metadata_type_options.allow_new_terms === 'yes'"
.metadata_type_options.allow_new_terms === 'yes'"
:maxtags="1" :maxtags="1"
:class="{ 'is-field-history': bulkEditionProcedures[criterion].isDone }" :class="{ 'is-field-history': bulkEditionProcedures[criterion].isDone }"
class="tainacan-bulk-edition-field tainacan-bulk-edition-field-last" class="tainacan-bulk-edition-field tainacan-bulk-edition-field-last"
@ -259,10 +254,10 @@
</div> </div>
<button <button
:disabled="!groupID" :disabled="!groupId"
v-if="!bulkEditionProcedures[criterion].isDone && v-if="!bulkEditionProcedures[criterion].isDone &&
!bulkEditionProcedures[criterion].isExecuting && !bulkEditionProcedures[criterion].isExecuting &&
bulkEditionProcedures[criterion].metadatumID && bulkEditionProcedures[criterion].metadatum &&
bulkEditionProcedures[criterion].action" bulkEditionProcedures[criterion].action"
@click="executeBulkEditionProcedure(criterion)" @click="executeBulkEditionProcedure(criterion)"
class="button is-white is-pulled-right"> class="button is-white is-pulled-right">
@ -328,17 +323,12 @@
totalItems: Array, totalItems: Array,
objectType: String, objectType: String,
selectedForBulk: Object, selectedForBulk: Object,
collectionID: Number collectionId: Number
}, },
data() { data() {
return { return {
statuses: {
draft: 'draft',
publish: 'publish',
private: 'private'
},
editionCriteria: [1], editionCriteria: [1],
editionActionsForMultiple: { editionActions: {
add: this.$i18n.get('add_value'), add: this.$i18n.get('add_value'),
redefine: this.$i18n.get('set_new_value'), redefine: this.$i18n.get('set_new_value'),
replace: this.$i18n.get('replace_value'), replace: this.$i18n.get('replace_value'),
@ -346,11 +336,6 @@
clear: this.$i18n.get('clear_values'), clear: this.$i18n.get('clear_values'),
copy: this.$i18n.get('copy_value') copy: this.$i18n.get('copy_value')
}, },
editionActionsForNotMultiple: {
redefine: this.$i18n.get('set_new_value'),
clear: this.$i18n.get('clear_values'),
copy: this.$i18n.get('copy_value')
},
bulkEditionProcedures: { bulkEditionProcedures: {
1: { 1: {
isDone: false, isDone: false,
@ -359,7 +344,7 @@
tooltipShow: true, tooltipShow: true,
} }
}, },
groupID: null, groupId: null,
dones: [false], dones: [false],
metadataIsLoading: false, metadataIsLoading: false,
metadataSearchCancel: undefined metadataSearchCancel: undefined
@ -371,7 +356,7 @@
} }
}, },
created(){ created(){
if (this.collectionID) { if (this.collectionId) {
this.metadataIsLoading = true; this.metadataIsLoading = true;
// Cancels previous Request // Cancels previous Request
@ -379,30 +364,31 @@
this.metadataSearchCancel.cancel('Metadata search Canceled.'); this.metadataSearchCancel.cancel('Metadata search Canceled.');
this.fetchMetadata({ this.fetchMetadata({
collectionId: this.collectionID, collectionId: this.collectionId,
isRepositoryLevel: false, isRepositoryLevel: false,
isContextEdit: true, isContextEdit: true,
includeDisabled: false, includeDisabled: false,
parent: 'any' parent: 'any'
}).then((resp) => { })
resp.request .then((resp) => {
.then(() => { resp.request
this.metadataIsLoading = false; .then(() => {
}).catch(() => { this.metadataIsLoading = false;
this.metadataIsLoading = false; }).catch(() => {
}); this.metadataIsLoading = false;
});
// Search Request Token for cancelling // Search Request Token for cancelling
this.metadataSearchCancel = resp.source; this.metadataSearchCancel = resp.source;
}) })
.catch(() => this.metadataIsLoading = false); .catch(() => this.metadataIsLoading = false);
} }
this.createEditGroup({ this.createEditGroup({
object: this.selectedForBulk, object: this.selectedForBulk,
collectionID: this.collectionID ? this.collectionID : 'default' collectionId: this.collectionId ? this.collectionId : 'default'
}).then(() => { }).then(() => {
this.groupID = this.getGroupID(); this.groupId = this.getGroupId();
}); });
}, },
mounted() { mounted() {
@ -417,7 +403,7 @@
}, },
methods: { methods: {
...mapGetters('bulkedition', [ ...mapGetters('bulkedition', [
'getGroupID' 'getGroupId'
]), ]),
...mapActions('bulkedition', [ ...mapActions('bulkedition', [
'createEditGroup', 'createEditGroup',
@ -439,111 +425,107 @@
]), ]),
finalizeProcedure(criterion){ finalizeProcedure(criterion){
let withError = false;
this.$set(this.bulkEditionProcedures[criterion], 'isDone', true); this.$set(this.bulkEditionProcedures[criterion], 'isDone', true);
let index = this.editionCriteria.indexOf(criterion); this.dones[this.editionCriteria.indexOf(criterion)] = true;
this.dones[index] = !withError;
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', false); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', false);
}, },
executeBulkEditionProcedure(criterion){ executeBulkEditionProcedure(criterion){
let procedure = this.bulkEditionProcedures[criterion]; let procedure = this.bulkEditionProcedures[criterion];
if (procedure.action === this.editionActionsForMultiple.redefine) { if (procedure.action === this.editionActions.redefine) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
if (procedure.metadatumID === 'status'){ if (procedure.metadatum.id === 'status'){
this.setStatusInBulk({ this.setStatusInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { value: procedure.newValue } bodyParams: { value: procedure.newValue }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} if(procedure.metadatumID === 'comments'){ } if(procedure.metadatum.id === 'comments'){
this.setCommentStatusInBulk({ this.setCommentStatusInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { value: procedure.newValue } bodyParams: { value: procedure.newValue }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} else { } else {
this.setValueInBulk({ this.setValueInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID, metadatum_id: procedure.metadatum.id,
value: procedure.newValue value: procedure.newValue
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} }
} else if (procedure.action === this.editionActionsForMultiple.add) { } else if (procedure.action === this.editionActions.add) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
this.addValueInBulk({ this.addValueInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID, metadatum_id: procedure.metadatum.id,
value: procedure.newValue, value: procedure.newValue,
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} else if (procedure.action === this.editionActionsForMultiple.replace) { } else if (procedure.action === this.editionActions.replace) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
this.replaceValueInBulk({ this.replaceValueInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID, metadatum_id: procedure.metadatum.id,
old_value: procedure.oldValue, old_value: procedure.oldValue,
new_value: procedure.newValue, new_value: procedure.newValue,
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} else if (procedure.action === this.editionActionsForMultiple.remove) { } else if (procedure.action === this.editionActions.remove) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
this.removeValueInBulk({ this.removeValueInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID, metadatum_id: procedure.metadatum.id,
value: procedure.newValue, value: procedure.newValue,
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} else if (procedure.action === this.editionActionsForMultiple.clear) { } else if (procedure.action === this.editionActions.clear) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
this.clearValuesInBulk({ this.clearValuesInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID metadatum_id: procedure.metadatum.id
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
}); });
} else if (procedure.action === this.editionActionsForMultiple.copy) { } else if (procedure.action === this.editionActions.copy) {
this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true); this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', true);
this.copyValuesInBulk({ this.copyValuesInBulk({
collectionID: this.collectionID, collectionId: this.collectionId,
groupID: this.groupID, groupId: this.groupId,
bodyParams: { bodyParams: {
metadatum_id: procedure.metadatumID, metadatum_id: parseInt(procedure.metadatum.id),
metadatum_id_copy_from: procedure.metadatumIdCopyFrom, metadatum_id_copy_from: parseInt(procedure.metadatumIdCopyFrom),
} }
}).then(() => { }).then(() => {
this.finalizeProcedure(criterion); this.finalizeProcedure(criterion);
@ -585,23 +567,64 @@
this.dones.splice(criterionIndex, 1) this.dones.splice(criterionIndex, 1)
} }
}, },
getValidEditionActions(metadatumID) { getValidEditionActions(metadatum) {
const isMultiple = this.getMetadataByID(metadatumID).multiple == 'yes'; let validEditionActions = JSON.parse(JSON.stringify(this.editionActions));
let validEditionActions = {};
for (let [actionKey, action] of Object.entries(isMultiple ? this.editionActionsForMultiple : this.editionActionsForNotMultiple)) { for (let actionKey of Object.keys(this.editionActions)) {
if ((metadatumID != 'status' && metadatumID != 'comments') || actionKey != 'clear')
validEditionActions[actionKey] = action; // Not multiple metadata have less options
if (metadatum.multiple != 'yes' && (actionKey == 'add' || actionKey == 'replace' || actionKey == 'remove')) {
delete validEditionActions[actionKey];
continue;
}
// These special metadata are even more limited
if ((metadatum.id == 'status' || metadatum.id == 'comments') && (actionKey == 'clear' || actionKey == 'copy')) {
delete validEditionActions[actionKey];
continue;
} else if (metadatum.id == 'created_by' && (actionKey == 'clear' || actionKey == 'redefine')) {
delete validEditionActions[actionKey];
continue;
}
// For allowing copy, we also need to check more details of the metadata
if (actionKey == 'copy' && metadatum.metadata_type_object) {
const otherMetadatumOfSameTypeIndex = this.metadata.findIndex(otherMetadatum => {
return (
otherMetadatum.id != metadatum.id &&
otherMetadatum.metadata_type_object.component == metadatum.metadata_type_object.component &&
otherMetadatum.parent <= 0
);
});
if (otherMetadatumOfSameTypeIndex < 0) {
delete validEditionActions[actionKey];
}
}
} }
return validEditionActions; return validEditionActions;
}, },
getMetadataByID(id) { getAllowedMetadataForCopy(criterion) {
let found = this.metadata.find((element) => { if (this.bulkEditionProcedures[criterion] &&
return element.id == id; this.bulkEditionProcedures[criterion].metadatum &&
}); this.bulkEditionProcedures[criterion].action &&
this.bulkEditionProcedures[criterion].action == this.editionActions.copy) {
const selectedMetadatum = this.bulkEditionProcedures[criterion].metadatum;
if (selectedMetadatum.metadata_type_object && selectedMetadatum.metadata_type_object.component) {
return this.metadata.filter((metadatum) => {
return (
metadatum.metadata_type_object.component === selectedMetadatum.metadata_type_object.component &&
metadatum.metadata_type_object.component === selectedMetadatum.metadata_type_object.component
)
});
} else if (selectedMetadatum.id == 'created_by') {
return this.metadata.filter(metadatum => metadatum.metadata_type_object.component == 'tainacan-user' && metadatum.parent <= 0)
}
}
return found ? found : {}; return [];
}, },
addToBulkEditionProcedures(value, key, criterion) { addToBulkEditionProcedures(value, key, criterion) {
if (Array.isArray(value)) if (Array.isArray(value))

7
src/views/admin/components/other/item-copy-dialog.vue
View File

@ -134,8 +134,7 @@
]), ]),
...mapActions('bulkedition', [ ...mapActions('bulkedition', [
'createEditGroup', 'createEditGroup',
'createSequenceEditGroup', 'createSequenceEditGroup'
'setStatusInBulk'
]), ]),
generateCopies() { generateCopies() {
this.isLoading = true; this.isLoading = true;
@ -164,7 +163,7 @@
this.isCreatingSequenceEditGroup = true; this.isCreatingSequenceEditGroup = true;
this.createSequenceEditGroup({ this.createSequenceEditGroup({
object: onlyItemIds, object: onlyItemIds,
collectionID: this.collectionId collectionId: this.collectionId
}).then((group) => { }).then((group) => {
let sequenceId = group.id; let sequenceId = group.id;
this.isCreatingSequenceEditGroup = false; this.isCreatingSequenceEditGroup = false;
@ -184,7 +183,7 @@
totalItems: onlyItemIds.length, totalItems: onlyItemIds.length,
selectedForBulk: onlyItemIds, selectedForBulk: onlyItemIds,
objectType: this.$i18n.get('items'), objectType: this.$i18n.get('items'),
collectionID: this.collectionId collectionId: this.collectionId
}, },
width: 'calc(100% - (2 * var(--tainacan-one-column)))', width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true trapFocus: true

74
src/views/admin/js/store/modules/bulk-edition/actions.js
View File

@ -2,7 +2,7 @@ import axios from '../../../axios';
export const createEditGroup = ({commit}, parameters) => { export const createEditGroup = ({commit}, parameters) => {
let object = parameters.object; let object = parameters.object;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
let bulkEditParams = null; let bulkEditParams = null;
@ -23,7 +23,7 @@ export const createEditGroup = ({commit}, parameters) => {
} }
return new Promise ((resolve, reject) => { return new Promise ((resolve, reject) => {
axios.tainacan.post(`/collection/${collectionID}/bulk-edit`, bulkEditParams) axios.tainacan.post(`/collection/${collectionId}/bulk-edit`, bulkEditParams)
.then(response => { .then(response => {
commit('setGroup', response.data); commit('setGroup', response.data);
resolve(response.data); resolve(response.data);
@ -66,15 +66,15 @@ export const fetchSequenceGroup = ({commit}, { collectionId, groupId }) => {
}; };
export const setValueInBulk = ({commit}, parameters) => { export const setValueInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, new_value } Object * @var bodyParams { metadatum_id, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/set`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/set`, bodyParams)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -85,15 +85,15 @@ export const setValueInBulk = ({commit}, parameters) => {
}; };
export const addValueInBulk = ({commit}, parameters) => { export const addValueInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, new_value } Object * @var bodyParams { metadatum_id, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/add`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/add`, bodyParams)
.then(response => { .then(response => {
return response; return response;
}) })
@ -103,45 +103,45 @@ export const addValueInBulk = ({commit}, parameters) => {
}; };
export const removeValueInBulk = ({commit}, parameters) => { export const removeValueInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, new_value } Object * @var bodyParams { metadatum_id, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/remove`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/remove`, bodyParams)
.catch(error => { .catch(error => {
console.error(error); console.error(error);
}); });
}; };
export const clearValuesInBulk = ({commit}, parameters) => { export const clearValuesInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, new_value } Object * @var bodyParams { metadatum_id, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/clear`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/clear`, bodyParams)
.catch(error => { .catch(error => {
console.error(error); console.error(error);
}); });
}; };
export const replaceValueInBulk = ({commit}, parameters) => { export const replaceValueInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, old_value, new_value } Object * @var bodyParams { metadatum_id, old_value, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/replace`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/replace`, bodyParams)
.then(response => { .then(response => {
return response; return response;
}) })
@ -151,8 +151,8 @@ export const replaceValueInBulk = ({commit}, parameters) => {
}; };
export const setStatusInBulk = ({commit}, parameters) => { export const setStatusInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* The new status value (draft, publish or private) * The new status value (draft, publish or private)
@ -160,7 +160,7 @@ export const setStatusInBulk = ({commit}, parameters) => {
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/set_status`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/set_status`, bodyParams)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -171,8 +171,8 @@ export const setStatusInBulk = ({commit}, parameters) => {
}; };
export const setCommentStatusInBulk = ({commit}, parameters) => { export const setCommentStatusInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* The new status value (draft, publish or private) * The new status value (draft, publish or private)
@ -180,7 +180,7 @@ export const setCommentStatusInBulk = ({commit}, parameters) => {
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/set_comment_status`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/set_comment_status`, bodyParams)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -191,10 +191,10 @@ export const setCommentStatusInBulk = ({commit}, parameters) => {
}; };
export const trashItemsInBulk = ({commit}, parameters) => { export const trashItemsInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/trash`) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/trash`)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -205,10 +205,10 @@ export const trashItemsInBulk = ({commit}, parameters) => {
}; };
export const untrashItemsInBulk = ({commit}, parameters) => { export const untrashItemsInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/untrash`) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/untrash`)
.then(response => { .then(response => {
return response; return response;
}) })
@ -218,10 +218,10 @@ export const untrashItemsInBulk = ({commit}, parameters) => {
}; };
export const deleteItemsInBulk = ({commit}, parameters) => { export const deleteItemsInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/delete_items`) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/delete_items`)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -233,15 +233,15 @@ export const deleteItemsInBulk = ({commit}, parameters) => {
export const copyValuesInBulk = ({commit}, parameters) => { export const copyValuesInBulk = ({commit}, parameters) => {
let groupID = parameters.groupID; let groupId = parameters.groupId;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
/** /**
* @var bodyParams { metadatum_id, new_value } Object * @var bodyParams { metadatum_id, new_value } Object
* */ * */
let bodyParams = parameters.bodyParams; let bodyParams = parameters.bodyParams;
return axios.tainacan.post(`/collection/${collectionID}/bulk-edit/${groupID}/copy_value`, bodyParams) return axios.tainacan.post(`/collection/${collectionId}/bulk-edit/${groupId}/copy_value`, bodyParams)
.then(response => { .then(response => {
commit('setLastUpdated'); commit('setLastUpdated');
return response; return response;
@ -269,7 +269,7 @@ export const fetchItemIdInSequence = ({commit}, { collectionId, sequenceId, item
export const createSequenceEditGroup = ({commit}, parameters) => { export const createSequenceEditGroup = ({commit}, parameters) => {
let object = parameters.object; let object = parameters.object;
let collectionID = parameters.collectionID; let collectionId = parameters.collectionId;
let sequenceEditParams = null; let sequenceEditParams = null;
@ -285,7 +285,7 @@ export const createSequenceEditGroup = ({commit}, parameters) => {
} }
return new Promise ((resolve, reject) => { return new Promise ((resolve, reject) => {
axios.tainacan.post(`/collection/${collectionID}/sequence-edit`, sequenceEditParams) axios.tainacan.post(`/collection/${collectionId}/sequence-edit`, sequenceEditParams)
.then(response => { .then(response => {
commit('setGroup', response.data); commit('setGroup', response.data);
resolve(response.data); resolve(response.data);

2
src/views/admin/js/store/modules/bulk-edition/getters.js
View File

@ -1,4 +1,4 @@
export const getGroupID = state => { export const getGroupId = state => {
return state.group.id; return state.group.id;
}; };

2
src/views/admin/pages/lists/activities-page.vue
View File

@ -603,7 +603,7 @@
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
max-width: 26px; max-width: 1.25em;
} }
.icon { .icon {

2
src/views/admin/pages/lists/capabilities-page.vue
View File

@ -245,7 +245,7 @@
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
max-width: 26px; max-width: 1.25em;
} }
.icon { .icon {

2
src/views/admin/pages/lists/collections-page.vue
View File

@ -545,7 +545,7 @@ export default {
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
max-width: 26px; max-width: 1.25em;
} }
.icon { .icon {

12
src/views/admin/pages/lists/filters-page.vue
View File

@ -209,7 +209,14 @@
}" }"
class="tainacan-icon" /> class="tainacan-icon" />
</span> </span>
<span class="metadatum-name"> <span
v-tooltip="{
content: metadatum.name + (metadatum.parent_name ? (' (' + $i18n.get('info_child_of') + ' ' + metadatum.parent_name + ')') : ''),
autoHide: true,
classes: ['tooltip', isRepositoryLevel ? 'repository-tooltip' : ''],
placement: 'auto-start'
}"
class="metadatum-name">
{{ metadatum.name }} {{ metadatum.name }}
<span <span
v-if="metadatum.parent_name" v-if="metadatum.parent_name"
@ -1051,8 +1058,7 @@ export default {
font-weight: bold; font-weight: bold;
margin-left: 0.4em; margin-left: 0.4em;
display: inline-block; display: inline-block;
max-width: 180px; width: calc(100% - 80px);
width: 60%;
} }
&:after, &:after,
&:before { &:before {

13
src/views/admin/pages/lists/items-page.vue
View File

@ -111,7 +111,8 @@
<button <button
class="button is-secondary" class="button is-secondary"
slot="trigger"> slot="trigger">
<span>{{ $i18n.getFrom('items','add_new') }}</span> <span class="is-hidden-touch">{{ $i18n.getFrom('items','add_new') }}</span>
<span class="is-hidden-desktop">{{ $i18n.get('add') }}</span>
<span class="icon"> <span class="icon">
<i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-arrowdown" /> <i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-arrowdown" />
</span> </span>
@ -228,7 +229,8 @@
<button <button
:aria-label="$i18n.get('label_sorting_direction')" :aria-label="$i18n.get('label_sorting_direction')"
class="button is-white" class="button is-white"
slot="trigger"> slot="trigger"
style="padding-right: 3px !important;">
<span class="icon is-small gray-icon"> <span class="icon is-small gray-icon">
<i <i
:class="order == 'DESC' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'" :class="order == 'DESC' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
@ -405,7 +407,7 @@
<span class="gray-icon"> <span class="gray-icon">
<i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-viewas"/> <i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-viewas"/>
</span> </span>
<span class="is-hidden-mobile">{{ $i18n.get('label_view_as') }}</span> <span class="is-hidden-tablet-only is-hidden-desktop-only">{{ $i18n.get('label_view_as') }}</span>
</button> </button>
</div> </div>
@ -1488,6 +1490,9 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.button.is-white {
padding: 2px 10px !important;
}
.field { .field {
align-items: center; align-items: center;
@ -1502,7 +1507,7 @@
.gray-icon i::before { .gray-icon i::before {
font-size: 1.3125em !important; font-size: 1.3125em !important;
color: var(--tainacan-info-color) !important; color: var(--tainacan-info-color) !important;
max-width: 26px; max-width: 1.25em;
} }
.view-mode-icon { .view-mode-icon {

2
src/views/admin/pages/lists/taxonomies-page.vue
View File

@ -437,7 +437,7 @@
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
max-width: 26px; max-width: 1.25em;
} }
.icon { .icon {

6
src/views/admin/scss/_tooltips.scss
View File

@ -224,7 +224,7 @@
text-align: left; text-align: left;
margin-left: 2px; margin-left: 2px;
padding-left: 0.875em; padding-left: 0.875em;
border-left: 1px solid var(--tainacan-gray3); border-left: 1px solid var(--tainacan-gray2);
.tainacan-compound-metadatum .label { .tainacan-compound-metadatum .label {
text-align: left; text-align: left;
@ -241,10 +241,10 @@
display: block; display: block;
max-height: 1px; max-height: 1px;
width: 35px; width: 35px;
background: var(--tainacan-gray3); background: var(--tainacan-gray2);
content: none; content: none;
color: transparent; color: transparent;
margin: 1em auto; margin: 1em auto 1em -0.875em;
} }
} }

6
src/views/admin/scss/tainacan-admin.scss
View File

@ -193,7 +193,7 @@ a:hover {
.tainacan-compound-group { .tainacan-compound-group {
margin-left: 2px; margin-left: 2px;
padding-left: 0.875em; padding-left: 0.875em;
border-left: 1px solid var(--tainacan-gray3); border-left: 1px solid var(--tainacan-gray2);
.tainacan-compound-metadatum .label { .tainacan-compound-metadatum .label {
margin-bottom: 0.25em; margin-bottom: 0.25em;
@ -208,10 +208,10 @@ a:hover {
display: block; display: block;
max-height: 1px; max-height: 1px;
width: 60px; width: 60px;
background: var(--tainacan-gray3); background: var(--tainacan-gray2);
content: none; content: none;
color: transparent; color: transparent;
margin: 1em auto; margin: 1em auto 1em -0.875em;
} }
} }

1
src/views/tainacan-admin-i18n.php
View File

@ -89,6 +89,7 @@ return apply_filters( 'tainacan-admin-i18n', [
'undo' => __( 'Undo', 'tainacan' ), 'undo' => __( 'Undo', 'tainacan' ),
'delete' => __( 'Delete', 'tainacan' ), 'delete' => __( 'Delete', 'tainacan' ),
'skip' => __( 'Skip', 'tainacan' ), 'skip' => __( 'Skip', 'tainacan' ),
'add' => __( 'Add', 'tainacan' ),
// Wordpress CommentsStatus // Wordpress CommentsStatus
'comments_status_open' => __( 'Open', 'tainacan' ), 'comments_status_open' => __( 'Open', 'tainacan' ),

15
src/views/theme-search/pages/theme-items-page.vue
View File

@ -201,7 +201,7 @@
<template v-if="!hideSortByButton"> <template v-if="!hideSortByButton">
<span <span
class="label" class="label"
style="padding-left: 2px;"> style="padding-left: 2px !important;">
{{ $i18n.get('info_by_inner') }} {{ $i18n.get('info_by_inner') }}
</span> </span>
<b-dropdown <b-dropdown
@ -337,7 +337,7 @@
<span class="gray-icon"> <span class="gray-icon">
<i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-viewas"/> <i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-viewas"/>
</span> </span>
<span class="is-hidden-touch is-hidden-desktop-only">{{ $i18n.get('label_view_as') }}</span> <span class="is-hidden-tablet-only is-hidden-desktop-only ">{{ $i18n.get('label_view_as') }}</span>
</button> </button>
</div> </div>
</div> </div>
@ -1321,6 +1321,10 @@
color: var(--tainacan-input-color) !important; color: var(--tainacan-input-color) !important;
background: transparent; background: transparent;
} }
.button.is-white {
padding: 2px 10px !important;
}
.field { .field {
align-items: center; align-items: center;
@ -1330,12 +1334,17 @@
.gray-icon .icon { .gray-icon .icon {
color: var(--tainacan-info-color) !important; color: var(--tainacan-info-color) !important;
padding-right: 10px; padding-right: 10px;
justify-content: space-between;
&.is-small {
width: 1em;
height: 1em;
}
} }
.gray-icon .icon i::before, .gray-icon .icon i::before,
.gray-icon i::before { .gray-icon i::before {
font-size: 1.3125em !important; font-size: 1.3125em !important;
color: var(--tainacan-info-color) !important; color: var(--tainacan-info-color) !important;
max-width: 26px; max-width: 1.25em;
} }
.dropdown-menu { .dropdown-menu {

6
src/views/theme-search/theme-search.vue
View File

@ -195,7 +195,7 @@ export default {
.tainacan-compound-group { .tainacan-compound-group {
margin-left: 2px; margin-left: 2px;
padding-left: 0.875em; padding-left: 0.875em;
border-left: 1px solid var(--tainacan-gray3); border-left: 1px solid var(--tainacan-gray2);
.tainacan-compound-metadatum .label { .tainacan-compound-metadatum .label {
margin-bottom: 0.25em; margin-bottom: 0.25em;
@ -210,10 +210,10 @@ export default {
display: block; display: block;
max-height: 1px; max-height: 1px;
width: 60px; width: 60px;
background: var(--tainacan-gray3); background: var(--tainacan-gray2);
content: none; content: none;
color: transparent; color: transparent;
margin: 1em auto; margin: 1em auto 1em -0.875em;
} }
} }