From 32eccd89749d6fa3f5d71cc01be79c00dda0dddf Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Nov 2023 09:11:43 +0100 Subject: [PATCH] Bug 35408: Fix import job link After importing titles from a list there is a link to the background job that is displayed. This link points to /cgi-bin/koha/admin/background_jobs/:id There is a route to this path in routes/erm.js, to redirect to the correct URI /cgi-bin/koha/admin/background_jobs.pl?op=view&id=:id However this link will not work if we are accessing it from outside the ERM app/module, or if we are opening it in a new tab/window. The idea was interesting, but does not work... Test plan: Create a new ERM local package, a new list (virtual shelf), add some items to the list. Go to E-resource management > eHoldings > Local > Titles > Import from a list Click "import" Notice the "see job" link and click it => Confirm that with this patch applied you can open it in a new tab without getting a 404 Signed-off-by: Matt Blenkinsop Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Katrin Fischer (cherry picked from commit 09d5355ffb6381b531b5d42cc97b17c1e9790da4) Signed-off-by: Fridolin Somers --- .../components/ERM/EHoldingsLocalTitlesFormImport.vue | 7 +++++-- koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js | 9 --------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue index fc3133b61c..9e2ec2b136 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue @@ -2,9 +2,12 @@

{{ $__("Import from a list") }}

{{ $__("Import in progress,") }} - + {{ $__("see job #%s").format(job_id) }} - +
{{ $__("To the following local package") }}: diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js index 105744d8a2..4f2331bdda 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js @@ -30,15 +30,6 @@ import UsageStatisticsReportsViewer from "../components/ERM/UsageStatisticsRepor import { $__ } from "../i18n"; export const routes = [ - { - path: "/cgi-bin/koha/admin/background_jobs/:id", - is_base: true, - beforeEnter(to, from, next) { - window.location.href = - "/cgi-bin/koha/admin/background_jobs.pl?op=view&id=" + - to.params.id; - }, - }, { path: "/cgi-bin/koha/erm/erm.pl", is_default: true, -- 2.39.5