Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32932: Update router to use object references - agreements

Browse source 
This patch updates the Vue files for ERM to use router object links rather than urls - this will make it much simpler to maintain the router if urls need to be updated. This first patch only updates the files in the agreements section of ERM as a first step to introduce the topic for discussion.

Test plan:
1) Apply patch
2) Navigate to the Agreements section of ERM and click on different navigation links/buttons
3) The links/buttons should all work as normal
4) Review the code to see that the component files now refer back to the router using objects rather than url strings

Signed-off-by: Agustin Moyano <agustinmoyano@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Matt Blenkinsop 2023-03-21 16:14:45 -03:00 committed by Tomas Cohen Arazi
parent 657fad8283
commit 5b3ecbe068
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
29 changed files with 238 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
View file

@ -159,7 +159,7 @@
<fieldset class="action">
<ButtonSubmit />
<router-link
to="/cgi-bin/koha/erm/agreements"
:to="{ name: 'AgreementsList' }"
role="button"
class="cancel"
>{{ $__("Cancel") }}</router-link
@ -375,7 +375,7 @@ export default {
client.agreements.update(agreement, agreement_id).then(
success => {
setMessage(this.$__("Agreement updated"))
this.$router.push("/cgi-bin/koha/erm/agreements")
this.$router.push({ name: "AgreementsList" })
},
error => {}
)
@ -383,7 +383,7 @@ export default {
client.agreements.create(agreement).then(
success => {
setMessage(this.$__("Agreement created"))
this.$router.push("/cgi-bin/koha/erm/agreements")
this.$router.push({ name: "AgreementsList" })
},
error => {}
)

24
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
View file

@ -165,16 +165,18 @@ export default {
error => {}
)
},
doShow: function (agreement, dt, event) {
doShow: function ({ agreement_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/agreements/" + agreement.agreement_id
)
this.$router.push({
name: "AgreementsShow",
params: { agreement_id },
})
},
doEdit: function (agreement, dt, event) {
this.$router.push(
"/cgi-bin/koha/erm/agreements/edit/" + agreement.agreement_id
)
doEdit: function ({ agreement_id }, dt, event) {
this.$router.push({
name: "AgreementsFormAddEdit",
params: { agreement_id },
})
},
doDelete: function (agreement, dt, event) {
this.setConfirmationDialog(
@ -228,10 +230,8 @@ export default {
if (!this.filters.by_expired) {
this.filters.max_expiration_date = ""
}
let new_route = build_url(
"/cgi-bin/koha/erm/agreements",
this.filters
)
let { href } = this.$router.resolve({ name: "AgreementsList" })
let new_route = build_url(href, this.filters)
this.$router.push(new_route)
}
this.$refs.table.redraw(this.table_url())

45
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
View file

@ -5,7 +5,10 @@
{{ $__("Agreement #%s").format(agreement.agreement_id) }}
<span class="action_links">
<router-link
:to="`/cgi-bin/koha/erm/agreements/edit/${agreement.agreement_id}`"
:to="{
name: 'AgreementsFormAddEdit',
params: { agreement_id: agreement.agreement_id },
}"
:title="$__('Edit')"
><i class="fa fa-pencil"></i
></router-link>
@ -161,7 +164,13 @@
>
<td>
<router-link
:to="`/cgi-bin/koha/erm/licenses/${agreement_license.license_id}`"
:to="{
name: 'LicensesShow',
params: {
license_id:
agreement_license.license_id,
},
}"
>
{{ agreement_license.license.name }}
</router-link>
@ -198,7 +207,15 @@
>
<span
><router-link
:to="`/cgi-bin/koha/erm/agreements/${relationship.related_agreement.agreement_id}`"
:to="{
name: 'AgreementsShow',
params: {
agreement_id:
relationship
.related_agreement
.agreement_id,
},
}"
>{{
relationship.related_agreement.name
}}</router-link
@ -230,7 +247,14 @@
"
>
<router-link
:to="`/cgi-bin/koha/erm/eholdings/ebsco/packages/${agreement_package.package.external_id}`"
:to="{
name: 'EHoldingsEBSCOPackagesShow',
params: {
package_id:
agreement_package.package
.external_id,
},
}"
>{{
agreement_package.package.name
}}</router-link
@ -239,7 +263,14 @@
>
<span v-else
><router-link
:to="`/cgi-bin/koha/erm/eholdings/local/packages/${agreement_package.package.package_id}`"
:to="{
name: 'EHoldingsLocalPackagesShow',
params: {
package_id:
agreement_package.package
.package_id,
},
}"
>{{
agreement_package.package.name
}}</router-link
@ -290,7 +321,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/agreements"
:to="{ name: 'AgreementsList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link
@ -381,7 +412,7 @@ export default {
),
true
)
this.$router.push("/cgi-bin/koha/erm/agreements")
this.$router.push({ name: "AgreementsList" })
},
error => {}
)

4
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue
View file

@ -1,8 +1,6 @@
<template>
<div id="toolbar" class="btn-toolbar">
<router-link
to="/cgi-bin/koha/erm/agreements/add"
class="btn btn-default"
<router-link :to="{ name: 'AgreementsFormAdd' }" class="btn btn-default"
><font-awesome-icon icon="plus" />
{{ $__("New agreement") }}</router-link
>

7
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
View file

@ -17,7 +17,12 @@
v-bind:key="counter"
>
<router-link
:to="`/cgi-bin/koha/erm/agreements/${package_agreement.agreement.agreement_id}`"
:to="{
name: 'AgreementsShow',
params: {
agreement_id: package_agreement.agreement.agreement_id,
},
}"
>{{ package_agreement.agreement.name }}</router-link
>
&nbsp;

10
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
View file

@ -129,12 +129,12 @@ export default {
}
},
methods: {
doShow: function (resource, dt, event) {
doShow: function ({ resource_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/ebsco/resources/" +
resource.resource_id
)
this.$router.push({
name: "EHoldingsEBSCOResourcesShow",
params: { resource_id },
})
},
filter_table: function () {
this.$refs.table.redraw(

26
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
View file

@ -145,25 +145,25 @@ 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)
},
},
methods: {
doShow: function (erm_package, dt, event) {
doShow: function ({ package_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/ebsco/packages/" +
erm_package.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

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
View file

@ -100,7 +100,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/eholdings/ebsco/packages"
:to="{ name: 'EHoldingsEBSCOPackagesList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link

10
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue
View file

@ -37,7 +37,10 @@
<label>{{ $__("Publication title") }}:</label>
<span
><router-link
:to="`/cgi-bin/koha/erm/eholdings/ebsco/titles/${resource.title_id}`"
:to="{
name: 'EHoldingsEBSCOTitlesShow',
params: { title_id: resource.title_id },
}"
>{{
resource.title.publication_title
}}</router-link
@ -77,7 +80,10 @@
<label>{{ $__("Package") }}:</label>
<span
><router-link
:to="`/cgi-bin/koha/erm/eholdings/ebsco/packages/${resource.package_id}`"
:to="{
name: 'EHoldingsEBSCOPackagesShow',
params: { package_id: resource.package_id },
}"
>{{ resource.package.name }}</router-link
></span
>

16
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue
View file

@ -66,9 +66,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 },
})
},
toggle_filters: function (e) {
this.display_filters = !this.display_filters
@ -83,6 +84,7 @@ export default {
let resources = this.resources
let filters = this.filters
let table_id = this.table_id
let router = this.$router
$.fn.dataTable.ext.search = $.fn.dataTable.ext.search.filter(
search => search.name != "apply_filter"
@ -122,13 +124,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)

25
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
View file

@ -149,26 +149,27 @@ export default {
},
computed: {
local_titles_url() {
return build_url(
"/cgi-bin/koha/erm/eholdings/local/titles",
this.filters
)
let { href } = this.$router.resolve({
name: "EHoldingsLocalTitlesList",
})
return build_url(href, this.filters)
},
},
methods: {
doShow: function (title, dt, event) {
doShow: function ({ title_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/ebsco/titles/" + title.title_id
)
this.$router.push({
name: "EHoldingsEBSCOTitlesShow",
params: { title_id },
})
},
filter_table: async function () {
if (this.filters.publication_title.length) {
this.cannot_search = false
let new_route = build_url(
"/cgi-bin/koha/erm/eholdings/ebsco/titles",
this.filters
)
let { href } = this.$router.resolve({
name: "EHoldingsEBSCOTitlesList",
})
let new_route = build_url(href, this.filters)
this.$router.push(new_route)
this.show_table = true
this.local_title_count = null

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue
View file

@ -232,7 +232,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/eholdings/ebsco/titles"
:to="{ name: 'EHoldingsEBSCOTitlesList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link

10
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
View file

@ -42,12 +42,12 @@ export default {
}
},
methods: {
doShow: function (resource, dt, event) {
doShow: function ({ resource_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/resources/" +
resource.resource_id
)
this.$router.push({
name: "EHoldingsLocalResourcesShow",
params: { resource_id },
})
},
getTableColumns: function () {
let get_lib_from_av = this.get_lib_from_av

14
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
View file

@ -72,7 +72,7 @@
<fieldset class="action">
<input type="submit" value="Submit" />
<router-link
to="/cgi-bin/koha/erm/eholdings/local/packages"
:to="{ name: 'EHoldingsLocalPackagesList' }"
role="button"
class="cancel"
>{{ $__("Cancel") }}</router-link
@ -183,9 +183,9 @@ export default {
client.localPackages.update(erm_package, package_id).then(
success => {
setMessage(this.$__("Package updated"))
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/packages"
)
this.$router.push({
name: "EHoldingsLocalPackagesList",
})
},
error => {}
)
@ -193,9 +193,9 @@ export default {
client.localPackages.create(erm_package).then(
success => {
setMessage(this.$__("Package created"))
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/packages"
)
this.$router.push({
name: "EHoldingsLocalPackagesList",
})
},
error => {}
)

20
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
View file

@ -115,18 +115,18 @@ export default {
error => {}
)
},
doShow: function (erm_package, dt, event) {
doShow: function ({ package_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/packages/" +
erm_package.package_id
)
this.$router.push({
name: "EHoldingsLocalPackagesShow",
params: { package_id },
})
},
doEdit: function (erm_package, dt, event) {
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/packages/edit/" +
erm_package.package_id
)
doEdit: function ({ package_id }, dt, event) {
this.$router.push({
name: "EHoldingsLocalPackagesFormAddEdit",
params: { package_id },
})
},
doDelete: function (erm_package, dt, event) {
this.setConfirmationDialog(

22
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
View file

@ -5,7 +5,10 @@
{{ $__("Package #%s").format(erm_package.package_id) }}
<span class="action_links">
<router-link
:to="`/cgi-bin/koha/erm/eholdings/local/packages/edit/${erm_package.package_id}`"
:to="{
name: 'EHoldingsLocalPackagesFormAddEdit',
params: { package_id: erm_package.package_id },
}"
:title="$__('Edit')"
><i class="fa fa-pencil"></i
></router-link>
@ -69,7 +72,14 @@
:key="package_agreement.agreement_id"
>
<router-link
:to="`/cgi-bin/koha/erm/agreements/${package_agreement.agreement.agreement_id}`"
:to="{
name: 'AgreementsShow',
params: {
agreement_id:
package_agreement.agreement
.agreement_id,
},
}"
>{{
package_agreement.agreement.name
}}</router-link
@ -92,7 +102,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/eholdings/local/packages"
:to="{ name: 'EHoldingsLocalPackagesList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link
@ -178,9 +188,9 @@ export default {
),
true
)
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/packages"
)
this.$router.push({
name: "EHoldingsLocalPackagesList",
})
},
error => {}
)

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue
View file

@ -1,7 +1,7 @@
<template>
<div id="toolbar" class="btn-toolbar">
<router-link
to="/cgi-bin/koha/erm/eholdings/local/packages/add"
:to="{ name: 'EHoldingsLocalPackagesFormAdd' }"
class="btn btn-default"
><font-awesome-icon icon="plus" />
{{ $__("New package") }}</router-link

10
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue
View file

@ -18,7 +18,10 @@
<label>{{ $__("Publication title") }}:</label>
<span
><router-link
:to="`/cgi-bin/koha/erm/eholdings/local/titles/${resource.title_id}`"
:to="{
name: 'EHoldingsLocalTitlesShow',
params: { title_id: resource.title_id },
}"
>{{
resource.title.publication_title
}}</router-link
@ -58,7 +61,10 @@
<label>{{ $__("Package") }}:</label>
<span
><router-link
:to="`/cgi-bin/koha/erm/eholdings/local/packages/${resource.package_id}`"
:to="{
name: 'EHoldingsLocalPackagesShow',
params: { package_id: resource.package_id },
}"
>{{ resource.package.name }}</router-link
></span
>

16
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlePackagesList.vue
View file

@ -22,12 +22,14 @@ export default {
},
methods: {
show_resource: function (resource_id) {
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/resources/" + resource_id
)
this.$router.push({
name: "EHoldingsLocalResourcesShow",
params: { resource_id },
})
},
build_datatable: function () {
let show_resource = this.show_resource
let router = this.$router
let resources = this.resources
let table_id = this.table_id
@ -59,13 +61,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: "EHoldingsLocalResourcesShow",
params: { resource_id },
})
let n = createVNode(
"a",
{
role: "button",
href:
"/cgi-bin/koha/erm/eholdings/local/resources/" +
row.resource_id,
href,
onClick: e => {
e.preventDefault()
show_resource(row.resource_id)

14
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue
View file

@ -370,7 +370,7 @@
<fieldset class="action">
<input type="submit" value="Submit" />
<router-link
to="/cgi-bin/koha/erm/eholdings/local/titles"
:to="{ name: 'EHoldingsLocalTitlesList' }"
role="button"
class="cancel"
>{{ $__("Cancel") }}</router-link
@ -499,9 +499,9 @@ export default {
client.localTitles.update(title, title_id).then(
success => {
setMessage(this.$__("Title updated"))
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/titles"
)
this.$router.push({
name: "EHoldingsLocalTitlesList",
})
},
error => {}
)
@ -509,9 +509,9 @@ export default {
client.localTitles.create(title).then(
success => {
setMessage(this.$__("Title created"))
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/titles"
)
this.$router.push({
name: "EHoldingsLocalTitlesList",
})
},
error => {}
)

19
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
View file

@ -107,17 +107,18 @@ export default {
error => {}
)
},
doShow: function (title, dt, event) {
doShow: function ({ title_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/titles/" + title.title_id
)
this.$router.push({
name: "EHoldingsLocalTitlesShow",
params: { title_id },
})
},
doEdit: function (title, dt, event) {
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/titles/edit/" +
title.title_id
)
doEdit: function ({ title_id }, dt, event) {
this.$router.push({
name: "EHoldingsLocalTitlesFormAddEdit",
params: { title_id },
})
},
doDelete: function (title, dt, event) {
this.setConfirmationDialog(

13
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue
View file

@ -5,7 +5,10 @@
{{ $__("Title #%s").format(title.title_id) }}
<span class="action_links">
<router-link
:to="`/cgi-bin/koha/erm/eholdings/local/titles/edit/${title.title_id}`"
:to="{
name: 'EHoldingsLocalTitlesFormAddEdit',
params: { title_id: title.title_id },
}"
:title="$__('Edit')"
><i class="fa fa-pencil"></i
></router-link>
@ -246,7 +249,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/eholdings/local/titles"
:to="{ name: 'EHoldingsLocalTitlesList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link
@ -346,9 +349,9 @@ export default {
),
true
)
this.$router.push(
"/cgi-bin/koha/erm/eholdings/local/titles"
)
this.$router.push({
name: "EHoldingsLocalTitlesList",
})
},
error => {}
)

4
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue
View file

@ -1,14 +1,14 @@
<template>
<div id="toolbar" class="btn-toolbar">
<router-link
to="/cgi-bin/koha/erm/eholdings/local/titles/add"
:to="{ name: 'EHoldingsLocalTitlesFormAdd' }"
class="btn btn-default"
><font-awesome-icon icon="plus" />
{{ $__("New title") }}</router-link
>
&nbsp;
<router-link
to="/cgi-bin/koha/erm/eholdings/local/titles/import"
:to="{ name: 'EHoldingsLocalTitlesFormImport' }"
class="btn btn-default"
><font-awesome-icon icon="plus" />
{{ $__("Import from list") }}</router-link

6
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
View file

@ -121,7 +121,7 @@
<fieldset class="action">
<input type="submit" :value="$__('Submit')" />
<router-link
to="/cgi-bin/koha/erm/licenses"
:to="{ name: 'LicensesList' }"
role="button"
class="cancel"
>{{ $__("Cancel") }}</router-link
@ -259,7 +259,7 @@ export default {
client.licenses.update(license, license_id).then(
success => {
setMessage(this.$__("License updated"))
this.$router.push("/cgi-bin/koha/erm/licenses")
this.$router.push({ name: "LicensesList" })
},
error => {}
)
@ -267,7 +267,7 @@ export default {
client.licenses.create(license).then(
success => {
setMessage(this.$__("License created"))
this.$router.push("/cgi-bin/koha/erm/licenses")
this.$router.push({ name: "LicensesList" })
},
error => {}
)

15
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
View file

@ -88,16 +88,15 @@ export default {
error => {}
)
},
doShow: function (license, dt, event) {
doShow: function ({ license_id }, dt, event) {
event.preventDefault()
this.$router.push(
"/cgi-bin/koha/erm/licenses/" + license.license_id
)
this.$router.push({ name: "LicensesShow", params: { license_id } })
},
doEdit: function (license, dt, event) {
this.$router.push(
"/cgi-bin/koha/erm/licenses/edit/" + license.license_id
)
doEdit: function ({ license_id }, dt, event) {
this.$router.push({
name: "LicensesFormAddEdit",
params: { license_id },
})
},
doDelete: function (license, dt, event) {
this.setConfirmationDialog(

9
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
View file

@ -5,7 +5,10 @@
{{ $__("License #%s").format(license.license_id) }}
<span class="action_links">
<router-link
:to="`/cgi-bin/koha/erm/licenses/edit/${license.license_id}`"
:to="{
name: 'LicensesFormAddEdit',
params: { license_id: license.license_id },
}"
:title="$__('Edit')"
><i class="fa fa-pencil"></i
></router-link>
@ -131,7 +134,7 @@
</fieldset>
<fieldset class="action">
<router-link
to="/cgi-bin/koha/erm/licenses"
:to="{ name: 'LicensesList' }"
role="button"
class="cancel"
>{{ $__("Close") }}</router-link
@ -216,7 +219,7 @@ export default {
),
true
)
this.$router.push("/cgi-bin/koha/erm/licenses")
this.$router.push({ name: "LicensesList" })
},
error => {}
)

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue
View file

@ -1,6 +1,6 @@
<template>
<div id="toolbar" class="btn-toolbar">
<router-link to="/cgi-bin/koha/erm/licenses/add" class="btn btn-default"
<router-link :to="{ name: 'LicensesFormAdd' }" class="btn btn-default"
><font-awesome-icon icon="plus" />
{{ $__("New license") }}</router-link
>

4
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
View file

@ -21,7 +21,7 @@
<ul>
<li>
<router-link
to="/cgi-bin/koha/erm/agreements"
:to="{ name: 'AgreementsList' }"
>
<i class="fa fa-check-circle-o"></i>
{{ $__("Agreements") }}</router-link
@ -29,7 +29,7 @@
</li>
<li>
<router-link
to="/cgi-bin/koha/erm/licenses"
:to="{ name: 'LicensesList' }"
>
<i class="fa fa-gavel"></i>
{{ $__("Licenses") }}</router-link

24
koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js
View file

@ -121,6 +121,7 @@ export const routes = [
},
{
path: "/cgi-bin/koha/erm/erm.pl",
name: "Home",
component: Home,
meta: {
breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
@ -131,6 +132,7 @@ export const routes = [
children: [
{
path: "",
name: "AgreementsList",
component: AgreementsList,
meta: {
breadcrumb: () => breadcrumb_paths.agreements,
@ -138,6 +140,7 @@ export const routes = [
},
{
path: ":agreement_id",
name: "AgreementsShow",
component: AgreementsShow,
meta: {
breadcrumb: () =>
@ -149,6 +152,7 @@ export const routes = [
},
{
path: "add",
name: "AgreementsFormAdd",
component: AgreementsFormAdd,
meta: {
breadcrumb: () =>
@ -160,6 +164,7 @@ export const routes = [
},
{
path: "edit/:agreement_id",
name: "AgreementsFormAddEdit",
component: AgreementsFormAdd,
meta: {
breadcrumb: () =>
@ -197,6 +202,7 @@ export const routes = [
children: [
{
path: "",
name: "EHoldingsLocalPackagesList",
component: EHoldingsLocalPackagesList,
meta: {
breadcrumb: () =>
@ -209,6 +215,7 @@ export const routes = [
},
{
path: ":package_id",
name: "EHoldingsLocalPackagesShow",
component: EHoldingsLocalPackagesShow,
meta: {
breadcrumb: () =>
@ -224,6 +231,7 @@ export const routes = [
},
{
path: "add",
name: "EHoldingsLocalPackagesFormAdd",
component: EHoldingsLocalPackagesFormAdd,
meta: {
breadcrumb: () =>
@ -239,6 +247,7 @@ export const routes = [
},
{
path: "edit/:package_id",
name: "EHoldingsLocalPackagesFormAddEdit",
component: EHoldingsLocalPackagesFormAdd,
meta: {
breadcrumb: () =>
@ -259,6 +268,7 @@ export const routes = [
children: [
{
path: "",
name: "EHoldingsLocalTitlesList",
component: EHoldingsLocalTitlesList,
meta: {
breadcrumb: () =>
@ -270,6 +280,7 @@ export const routes = [
},
{
path: ":title_id",
name: "EHoldingsLocalTitlesShow",
component: EHoldingsLocalTitlesShow,
meta: {
breadcrumb: () =>
@ -285,6 +296,7 @@ export const routes = [
},
{
path: "add",
name: "EHoldingsLocalTitlesFormAdd",
component: EHoldingsLocalTitlesFormAdd,
meta: {
breadcrumb: () =>
@ -300,6 +312,7 @@ export const routes = [
},
{
path: "edit/:title_id",
name: "EHoldingsLocalTitlesFormAddEdit",
component: EHoldingsLocalTitlesFormAdd,
meta: {
breadcrumb: () =>
@ -315,6 +328,7 @@ export const routes = [
},
{
path: "import",
name: "EHoldingsLocalTitlesFormImport",
component: EHoldingsLocalTitlesFormImport,
meta: {
breadcrumb: () =>
@ -332,6 +346,7 @@ export const routes = [
},
{
path: "resources/:resource_id",
name: "EHoldingsLocalResourcesShow",
component: EHoldingsLocalResourcesShow,
meta: {
breadcrumb: () =>
@ -360,6 +375,7 @@ export const routes = [
children: [
{
path: "",
name: "EHoldingsEBSCOPackagesList",
component: EHoldingsEBSCOPackagesList,
meta: {
breadcrumb: () =>
@ -372,6 +388,7 @@ export const routes = [
},
{
path: ":package_id",
name: "EHoldingsEBSCOPackagesShow",
component: EHoldingsEBSCOPackagesShow,
meta: {
breadcrumb: () =>
@ -392,6 +409,7 @@ export const routes = [
children: [
{
path: "",
name: "EHoldingsEBSCOTitlesList",
component: EHoldingsEBSCOTitlesList,
meta: {
breadcrumb: () =>
@ -403,6 +421,7 @@ export const routes = [
},
{
path: ":title_id",
name: "EHoldingsEBSCOTitlesShow",
component: EHoldingsEBSCOTitlesShow,
meta: {
breadcrumb: () =>
@ -420,6 +439,7 @@ export const routes = [
},
{
path: "resources/:resource_id",
name: "EHoldingsEBSCOResourcesShow",
component: EHoldingsEBSCOResourcesShow,
meta: {
breadcrumb: () =>
@ -441,6 +461,7 @@ export const routes = [
children: [
{
path: "",
name: "LicensesList",
component: LicensesList,
meta: {
breadcrumb: () => breadcrumb_paths.licenses,
@ -448,6 +469,7 @@ export const routes = [
},
{
path: ":license_id",
name: "LicensesShow",
component: LicensesShow,
meta: {
breadcrumb: () =>
@ -459,6 +481,7 @@ export const routes = [
},
{
path: "add",
name: "LicensesFormAdd",
component: LicensesFormAdd,
meta: {
breadcrumb: () =>
@ -470,6 +493,7 @@ export const routes = [
},
{
path: "edit/:license_id",
name: "LicensesFormAddEdit",
component: LicensesFormAdd,
meta: {
breadcrumb: () =>