From c0ead5b9414a4a3b03b3f5a75161fc67aaeb195b Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Mon, 30 Sep 2019 12:52:11 -0300 Subject: [PATCH] Adds related objects to activities modal #261. --- src/admin/components/lists/filters-list.vue | 152 ++++++++++-------- src/admin/components/lists/metadata-list.vue | 9 +- .../other/activity/activity-details-modal.vue | 67 ++++++-- src/admin/js/utilities.js | 18 ++- src/admin/tainacan-admin-i18n.php | 1 + 5 files changed, 163 insertions(+), 84 deletions(-) diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue index da180a040..113203bf9 100644 --- a/src/admin/components/lists/filters-list.vue +++ b/src/admin/components/lists/filters-list.vue @@ -117,7 +117,7 @@ @input="onChangeEnable($event, index)"/> + @click.prevent="toggleFilterEdition(filter.id)"> -
+

{{ activity.title ? activity.title : $i18n.get('activity') }}

+

{{ activityCreationDate + ', ' + $i18n.get('info_by_inner') }} {{ activity.user_name }}

-

{{ $i18n.get('label_activity_description') }}: {{ activity.description }}

-

{{ $i18n.get('label_activity_creation_date') }}: {{ activityCreationDate }}

-

{{ $i18n.get('label_activity_author') }}: {{ activity.user_name }}

+

+ {{ $i18n.get('label_related_to') }}: + +

@@ -609,15 +614,54 @@ dateFormat: '', activityCreationDate: '', placeholderSquareImage: `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`, - isLoadingActivity: false + isLoadingActivity: false, + adminFullURL: tainacan_plugin.admin_url + 'admin.php?page=tainacan_admin#', } }, components: { FileItem }, + watch: { + '$route' (to, from) { + if (to !== from) + this.$parent.close(); + } + }, computed: { activity() { return this.getActivity(); + }, + relatedToLink() { + switch(this.activity.object_type) { + case 'Tainacan\\Entities\\Collection': + return `${ this.$i18n.get('collection') } + ${ this.activity.object.name } +  `; + case 'Tainacan\\Entities\\Taxonomy': + return `${ this.$i18n.get('taxonomy') } + ${ this.activity.object.name } +  `; + case 'Tainacan\\Entities\\Metadatum': + return `${ this.$i18n.get('metadatum') } + ${ this.activity.object.name } +  `; + case 'Tainacan\\Entities\\Filter': + return `${ this.$i18n.get('filter') } + ${ this.activity.object.name } +  `; + case 'Tainacan\\Entities\\Term': + return `${ this.$i18n.get('term') } + ${ this.activity.object.name } +  `; + case 'Tainacan\\Entities\\Item': + return `${ this.$i18n.get('item') } + ${ this.activity.object.title } +  `; + case 'Tainacan\\Entities\\Item_Metadata_Entity': + return `${ this.$i18n.get('item') } + ${ this.activity.item.title } +  `; + } } }, created() { @@ -635,9 +679,6 @@ }, notApproveActivity(){ this.$emit('notApproveActivity', this.activity.id); - }, - undo(){ - }, loadActivity() { this.isLoadingActivity = true; @@ -677,11 +718,15 @@ display: flex; flex-direction: column; width: 100%; + + p { + margin-right: auto; + } } .tainacan-modal-content { width: auto; - min-height: 600px; + min-height: 500px; p { font-size: 0.875rem; @@ -689,10 +734,10 @@ } .modal-card-body { - min-height: 400px; + min-height: 300px; padding: 0; .columns { - margin: 12px $page-side-padding; + margin: 6px $page-side-padding 0 $page-side-padding; } } diff --git a/src/admin/js/utilities.js b/src/admin/js/utilities.js index 36782f43d..056594da6 100644 --- a/src/admin/js/utilities.js +++ b/src/admin/js/utilities.js @@ -227,9 +227,6 @@ RouterHelperPlugin.install = function (Vue, options = {}) { getFiltersPath(query) { return '/filters/?' + qs.stringify(query); }, - getMetadataPath(query) { - return '/metadata/?' + qs.stringify(query); - }, getActivitiesPath(query) { return '/activities/?' + qs.stringify(query); }, @@ -302,14 +299,23 @@ RouterHelperPlugin.install = function (Vue, options = {}) { getItemEditPath(collectionId, itemId) { return '/collections/' + collectionId + '/items/' + itemId + '/edit'; }, - getFilterEditPath(id) { - return '/filters/' + id + '/edit'; + getMetadataEditPath(metadatumId) { + return '/metadata/?edit=' + metadatumId; + }, + getFilterEditPath(filterId) { + return '/filters/?edit=' + filterId; + }, + getCollectionMetadataEditPath(collectionId, metadatumId) { + return '/collections/' + collectionId + '/metadata/?edit=' + metadatumId; + }, + getCollectionFilterEditPath(collectionId, filterId) { + return '/collections/' + collectionId + '/filters/?edit=' + filterId; }, getTaxonomyEditPath(id, isRecent) { return isRecent != undefined ? '/taxonomies/' + id + '/edit?recent=true' : '/taxonomies/' + id + '/edit'; }, getTermEditPath(taxonomyId, termId) { - return '/taxonomies/' + taxonomyId + '/terms/' + termId + '/edit'; + return '/taxonomies/' + taxonomyId + '/edit?tab=terms'; }, getImporterEditionPath(importerType) { return '/importers/' + importerType; diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index d9678968e..db6b47787 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -434,6 +434,7 @@ return apply_filters( 'tainacan-admin-i18n', [ 'label_day' => __( 'Day', 'tainacan' ), 'label_month' => __( 'Month', 'tainacan' ), 'label_year' => __( 'Year', 'tainacan' ), + 'label_related_to' => __( 'Related to', 'tainacan' ), // Instructions. More complex sentences to guide user and placeholders 'instruction_delete_selected_collections' => __( 'Delete selected collections', 'tainacan' ),