@@ -, +, @@
---
.../ERM/EHoldingsEBSCOPackageAgreements.vue | 7 +++-
.../ERM/EHoldingsEBSCOPackageTitlesList.vue | 16 ++++++----
.../ERM/EHoldingsEBSCOPackagesList.vue | 32 +++++++++++--------
.../ERM/EHoldingsEBSCOPackagesShow.vue | 2 +-
.../ERM/EHoldingsEBSCOResourcesShow.vue | 10 ++++--
.../ERM/EHoldingsEBSCOTitlePackagesList.vue | 16 ++++++----
.../ERM/EHoldingsEBSCOTitlesList.vue | 23 ++++++-------
.../ERM/EHoldingsEBSCOTitlesShow.vue | 2 +-
.../ERM/EHoldingsLocalPackageTitlesList.vue | 16 ++++++----
.../ERM/EHoldingsLocalPackagesFormAdd.vue | 14 ++++----
...HoldingsLocalPackagesFormConfirmDelete.vue | 6 ++--
.../ERM/EHoldingsLocalPackagesList.vue | 31 ++++++++++--------
.../ERM/EHoldingsLocalPackagesShow.vue | 21 +++++++++---
.../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +-
.../ERM/EHoldingsLocalResourcesShow.vue | 10 ++++--
.../ERM/EHoldingsLocalTitlePackagesList.vue | 16 ++++++----
.../ERM/EHoldingsLocalTitlesFormAdd.vue | 14 ++++----
.../EHoldingsLocalTitlesFormConfirmDelete.vue | 6 ++--
.../ERM/EHoldingsLocalTitlesList.vue | 30 ++++++++++-------
.../ERM/EHoldingsLocalTitlesShow.vue | 12 +++++--
.../ERM/EHoldingsLocalTitlesToolbar.vue | 4 +--
21 files changed, 177 insertions(+), 113 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,12 @@
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
@@ -92,9 +92,10 @@ export default {
},
methods: {
show_resource: function (resource_id) {
- this.$router.push(
- "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id
- )
+ this.$router.push({
+ name: "EHoldingsEBSCOResourcesShow",
+ params: { resource_id },
+ })
},
filter_table: function () {
$("#" + this.table_id)
@@ -111,6 +112,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 +181,15 @@ 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,10 +107,10 @@ export default {
},
computed: {
local_packages_url() {
- return build_url(
- "/cgi-bin/koha/erm/eholdings/local/packages",
- this.filters
- )
+ let { href } = this.$router.resolve({
+ name: "EHoldingsLocalPackagesList",
+ })
+ return build_url(href, this.filters)
},
},
beforeRouteEnter(to, from, next) {
@@ -120,15 +120,16 @@ export default {
},
methods: {
show_package: function (package_id) {
- this.$router.push(
- "/cgi-bin/koha/erm/eholdings/ebsco/packages/" + package_id
- )
+ this.$router.push({
+ name: "EHoldingsEBSCOPackagesShow",
+ params: { package_id },
+ })
},
filter_table: async function () {
- let new_route = build_url(
- "/cgi-bin/koha/erm/eholdings/ebsco/packages",
- this.filters
- )
+ let { href } = this.$router.resolve({
+ name: "EHoldingsEBSCOPackagesShow",
+ })
+ let new_route = build_url(href, this.filters)
this.$router.push(new_route)
this.show_table = true
this.local_count_packages = null
@@ -157,6 +158,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
@@ -262,13 +264,15 @@ 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 @@