diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue index 22018a4b5..23ff992a6 100644 --- a/src/admin/components/edition/collection-edition-form.vue +++ b/src/admin/components/edition/collection-edition-form.vue @@ -811,6 +811,8 @@ export default { }, mounted(){ + this.$root.$emit('onCollectionBreadCrumbUpdate', [{ path: '', label: this.$i18n.get('settings') }]); + if (this.$route.query.fromImporter != undefined) this.fromImporter = this.$route.query.fromImporter; diff --git a/src/admin/components/edition/importer-edition-form.vue b/src/admin/components/edition/importer-edition-form.vue index a0a06ea74..85563f865 100644 --- a/src/admin/components/edition/importer-edition-form.vue +++ b/src/admin/components/edition/importer-edition-form.vue @@ -1,7 +1,11 @@ diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 3a3051b87..bd856d720 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -93,7 +93,8 @@ Vue.use(eventBusSearch, { store: store, router: router}); // Changing title of pages router.beforeEach((to, from, next) => { document.title = to.meta.title; - next(); + if (next() != undefined) + next(); }); new Vue({ diff --git a/src/admin/js/router.js b/src/admin/js/router.js index fd625de9e..0e512d518 100644 --- a/src/admin/js/router.js +++ b/src/admin/js/router.js @@ -52,6 +52,7 @@ const routes = [ { path: 'metadata', component: MetadataList, name: 'MetadataList', meta: {title: i18nGet('title_collection_metadata_edition'), icon: 'folder-multiple'} }, { path: 'filters', component: FiltersList, name: 'FiltersList', meta: {title: i18nGet('title_collection_filters_edition'), icon: 'folder-multiple'} }, { path: 'events', component: EventsPage, name: 'CollectionEventsPage', meta: {title: i18nGet('title_collection_events'), icon: 'flash'} }, + { path: 'events/:eventId', name: 'CollectionEventPage', component: EventPage, meta: {title: i18nGet('title_event_page'), icon: 'flash'} }, { path: 'sequence/:sequenceId', name: 'SavedSequenceEditionForm', component: ItemEditionForm, meta: {title: i18nGet('title_edit_item'), icon: 'folder-multiple'} }, { path: 'sequence/:sequenceId/:itemPosition', name: 'SequenceEditionForm', component: ItemEditionForm, meta: {title: i18nGet('title_edit_item'), icon: 'folder-multiple'} }, ] diff --git a/src/admin/js/utilities.js b/src/admin/js/utilities.js index b711c5bbf..5eb7ab072 100644 --- a/src/admin/js/utilities.js +++ b/src/admin/js/utilities.js @@ -190,8 +190,8 @@ RouterHelperPlugin.install = function (Vue, options = {}) { getItemsPath(query) { return '/items/?' + qs.stringify(query); }, - getPath(query) { - return '/taxonomies/?' + qs.stringify(query); + getTaxonomiesPath() { + return '/taxonomies/' }, getTaxonomyTermsPath(taxonomyId, query) { return '/taxonomyId/' + taxonomyId + '/terms/?' + qs.stringify(query); @@ -206,7 +206,7 @@ RouterHelperPlugin.install = function (Vue, options = {}) { return '/events/?' + qs.stringify(query); }, getAvailableImportersPath() { - return '/importers/new'; + return '/importers'; }, getProcessesPage(highlightedProcess) { if (highlightedProcess) @@ -236,6 +236,9 @@ RouterHelperPlugin.install = function (Vue, options = {}) { getImporterPath(importerType, sessionId) { return '/importers/' + importerType + '/' + sessionId; }, + getCollectionEventPath(collectionId, eventId) { + return '/collections/' + collectionId + '/events/' + eventId; + }, // New getNewCollectionPath() { return '/collections/new'; diff --git a/src/admin/pages/lists/available-importers-page.vue b/src/admin/pages/lists/available-importers-page.vue index 3664613b8..ea323fc0d 100644 --- a/src/admin/pages/lists/available-importers-page.vue +++ b/src/admin/pages/lists/available-importers-page.vue @@ -1,6 +1,7 @@