From c29aad104442069923f275f40554c20ade4a0b9a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 29 Feb 2024 14:01:13 +0100 Subject: [PATCH] Bug 35919: Adjust RewriteRule and routes to match existing ones --- debian/templates/apache-shared-intranet.conf | 2 +- .../prog/js/vue/components/Admin/RecordSources/Edit.vue | 4 ++-- .../intranet-tmpl/prog/js/vue/routes/admin/record_sources.js | 1 + t/cypress/integration/Admin/RecordSources_spec.ts | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf index 835b0812b6b..cdd514054fd 100644 --- a/debian/templates/apache-shared-intranet.conf +++ b/debian/templates/apache-shared-intranet.conf @@ -24,7 +24,7 @@ RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L] RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT] RewriteCond %{REQUEST_URI} !^/cgi-bin/koha/preservation/.*.pl$ RewriteRule ^/cgi-bin/koha/preservation/.*$ /cgi-bin/koha/preservation/home.pl [PT] -RewriteRule ^/cgi-bin/koha/admin/record_sources(.*)?$ /cgi-bin/koha/admin/record_sources.pl$1 [PT] +RewriteRule ^/cgi-bin/koha/admin/record_sources/.*$ /cgi-bin/koha/admin/record_sources.pl [PT] Alias "/api" "/usr/share/koha/api" diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/Edit.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/Edit.vue index df4234452e6..1c1e676471d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/Edit.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/Edit.vue @@ -27,7 +27,7 @@
{{ $__("Cancel") }} { this.setMessage(responseMessage) - return this.$router.push({ path: "../record_sources" }) + return this.$router.push({ name: "List" }) }) }, }, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/admin/record_sources.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/admin/record_sources.js index ceac79d6c11..9096b8df77e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/admin/record_sources.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/admin/record_sources.js @@ -20,6 +20,7 @@ export default { { title: $__("List"), path: "", + name: "List", component: markRaw(List), }, { diff --git a/t/cypress/integration/Admin/RecordSources_spec.ts b/t/cypress/integration/Admin/RecordSources_spec.ts index 99a0f2eb627..0fa77a47b18 100644 --- a/t/cypress/integration/Admin/RecordSources_spec.ts +++ b/t/cypress/integration/Admin/RecordSources_spec.ts @@ -15,7 +15,6 @@ describe("Breadcrumbs tests", () => { cy.get(".item-last").contains("Record sources"); // use the 'New' button cy.contains("New record source").click(); - cy.wait(500); cy.get(".current").contains("Add record source"); cy.get("#breadcrumbs") .contains("Record sources") @@ -114,7 +113,6 @@ describe("Record sources CRUD tests", () => { cy.get("#record_sources_list table tbody tr:first") .contains("Edit") .click(); - cy.wait(500); cy.get("#name").should("have.value", "Source 1"); cy.get("#can_be_edited").should("be.checked"); @@ -126,7 +124,7 @@ describe("Record sources CRUD tests", () => { can_be_edited: false, }, }); - cy.visit("/cgi-bin/koha/admin/record_sources/1"); + cy.visit("/cgi-bin/koha/admin/record_sources/edit/1"); cy.get("#name").should("have.value", "Source 1"); cy.get("#can_be_edited").should("not.be.checked"); -- 2.34.1