Attachment 162599 Details for Bug 35919 – Bug 35919: Adjust RewriteRule and routes to match existing ones

[patch] Bug 35919: Adjust RewriteRule and routes to match existing ones

Bug-35919-Adjust-RewriteRule-and-routes-to-match-e.patch (text/plain), 4.26 KB, created by Jonathan Druart on 2024-02-29 13:24:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-02-29 13:24:35 UTC

Size: 4.26 KB

patch

obsolete

>From c29aad104442069923f275f40554c20ade4a0b9a Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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"
> <Directory "/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 @@
>             <fieldset class="action">
>                 <input type="submit" :value="$__('Submit')" />
>                 <router-link
>-                    to="../record_sources"
>+                    :to="{ name: 'List' }"
>                     role="button"
>                     class="cancel"
>                     >{{ $__("Cancel") }}</router-link
>@@ -79,7 +79,7 @@ export default {
>             }
>             return response.then(responseMessage => {
>                 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

Actions: View | Diff | Splinter Review

Attachments on bug 35919: 161531 | 161532 | 161533 | 161534 | 161535 | 161537 | 161538 | 161577 | 161578 | 161579 | 161580 | 161581 | 161582 | 161583 | 162489 | 162594 | 162595 | 162596 | 162599 | 163348 | 163349 | 163350 | 163351 | 163352 | 163353 | 163354 | 163355 | 163360 | 163369 | 163389 | 163390 | 163391 | 163392 | 163393 | 163394 | 163395 | 163396 | 163397 | 163398 | 163399 | 163400 | 164708 | 164709 | 164710 | 164711 | 164712 | 164713 | 164714 | 164715 | 164716 | 164717 | 165274