@@ -, +, @@
---
.../ERM/EHoldingsEBSCOPackageAgreements.vue | 2 +-
.../ERM/EHoldingsEBSCOPackageTitlesList.vue | 8 ++++----
.../components/ERM/EHoldingsEBSCOPackagesList.vue | 14 ++++++++------
.../components/ERM/EHoldingsEBSCOPackagesShow.vue | 2 +-
.../components/ERM/EHoldingsEBSCOResourcesShow.vue | 4 ++--
.../ERM/EHoldingsEBSCOTitlePackagesList.vue | 8 ++++----
.../components/ERM/EHoldingsEBSCOTitlesList.vue | 8 +++++---
.../components/ERM/EHoldingsEBSCOTitlesShow.vue | 2 +-
.../ERM/EHoldingsLocalPackageTitlesList.vue | 8 ++++----
.../ERM/EHoldingsLocalPackagesFormAdd.vue | 6 +++---
.../EHoldingsLocalPackagesFormConfirmDelete.vue | 4 ++--
.../components/ERM/EHoldingsLocalPackagesList.vue | 13 ++++++-------
.../components/ERM/EHoldingsLocalPackagesShow.vue | 8 ++++----
.../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +-
.../components/ERM/EHoldingsLocalResourcesShow.vue | 4 ++--
.../ERM/EHoldingsLocalTitlePackagesList.vue | 8 ++++----
.../components/ERM/EHoldingsLocalTitlesFormAdd.vue | 6 +++---
.../ERM/EHoldingsLocalTitlesFormConfirmDelete.vue | 4 ++--
.../components/ERM/EHoldingsLocalTitlesList.vue | 12 ++++++------
.../components/ERM/EHoldingsLocalTitlesShow.vue | 6 +++---
.../components/ERM/EHoldingsLocalTitlesToolbar.vue | 4 ++--
21 files changed, 68 insertions(+), 65 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
+++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
@@ -17,7 +17,7 @@
v-bind:key="counter"
>
{{ package_agreement.agreement.name }}
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
+++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
@@ -93,7 +93,7 @@ export default {
methods: {
show_resource: function (resource_id) {
this.$router.push(
- "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id
+ { name: 'EHoldingsEBSCOResourcesShow', params: { resource_id }}
)
},
filter_table: function () {
@@ -111,6 +111,7 @@ export default {
let map_av_dt_filter = this.map_av_dt_filter
let filters = this.filters
let table_id = this.table_id
+ let router = this.$router
window["av_title_publication_types"] = map_av_dt_filter(
"av_title_publication_types"
@@ -179,13 +180,12 @@ export default {
let tr = $(this).parent()
let row = api.row(tr).data()
if (!row) return // Happen if the table is empty
+ let { href } = router.resolve({ name: 'EHoldingsEBSCOResourcesShow', params: { resource_id: row.resource_id }})
let n = createVNode(
"a",
{
role: "button",
- href:
- "/cgi-bin/koha/erm/eholdings/ebsco/resources/" +
- row.resource_id,
+ href,
onClick: e => {
e.preventDefault()
show_resource(row.resource_id)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
+++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
@@ -107,8 +107,9 @@ export default {
},
computed: {
local_packages_url() {
+ let { href } = this.$router.resolve({ name: 'EHoldingsLocalPackagesList'})
return build_url(
- "/cgi-bin/koha/erm/eholdings/local/packages",
+ href,
this.filters
)
},
@@ -121,12 +122,13 @@ export default {
methods: {
show_package: function (package_id) {
this.$router.push(
- "/cgi-bin/koha/erm/eholdings/ebsco/packages/" + package_id
+ { name: 'EHoldingsEBSCOPackagesShow', params: { package_id } }
)
},
filter_table: async function () {
+ let { href } = this.$router.resolve({ name: 'EHoldingsEBSCOPackagesShow'})
let new_route = build_url(
- "/cgi-bin/koha/erm/eholdings/ebsco/packages",
+ href,
this.filters
)
this.$router.push(new_route)
@@ -145,6 +147,7 @@ export default {
let show_package = this.show_package
let get_lib_from_av = this.get_lib_from_av
let map_av_dt_filter = this.map_av_dt_filter
+ let router = this.$router
if (!this.show_table) {
this.show_table = build_url_params(this.filters).length
@@ -250,13 +253,12 @@ export default {
let tr = $(this).parent()
let row = api.row(tr).data()
if (!row) return // Happen if the table is empty
+ let { href } = router.resolve({ name: 'EHoldingsEBSCOPackagesShow', params: { package_id: row.package_id } })
let n = createVNode(
"a",
{
role: "button",
- href:
- "/cgi-bin/koha/erm/eholdings/ebsco/packages/" +
- row.package_id,
+ href,
onClick: e => {
e.preventDefault()
show_package(row.package_id)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
+++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
@@ -102,7 +102,7 @@