View | Details | Raw Unified | Return to bug 33490
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-6 / +6 lines)
Lines 208-225 export default { Link Here
208
        },
208
        },
209
        table_url: function () {
209
        table_url: function () {
210
            let url = "/api/v1/erm/agreements"
210
            let url = "/api/v1/erm/agreements"
211
            if (this.filters.by_expired) {
212
                if (!this.filters.max_expiration_date)
213
                    this.filters.max_expiration_date = new Date()
214
                        .toISOString()
215
                        .substring(0, 10)
216
            }
217
            if (this.filters.by_expired)
211
            if (this.filters.by_expired)
218
                url +=
212
                url +=
219
                    "?max_expiration_date=" + this.filters.max_expiration_date
213
                    "?max_expiration_date=" + this.filters.max_expiration_date
220
            return url
214
            return url
221
        },
215
        },
222
        filter_table: async function () {
216
        filter_table: async function () {
217
            if (this.filters.by_expired) {
218
                if (!this.filters.max_expiration_date)
219
                    this.filters.max_expiration_date = new Date()
220
                        .toISOString()
221
                        .substring(0, 10)
222
            }
223
            if (!this.embedded) {
223
            if (!this.embedded) {
224
                let new_route = build_url(
224
                let new_route = build_url(
225
                    "/cgi-bin/koha/erm/agreements",
225
                    "/cgi-bin/koha/erm/agreements",
(-)a/t/cypress/integration/ERM/Agreements_spec.ts (-3 / +2 lines)
Lines 170-179 describe("Agreement CRUD operations", () => { Link Here
170
            .its('request.url')
170
            .its('request.url')
171
            .should('include', 'max_expiration_date='+dates["today_iso"]); // Defaults to today
171
            .should('include', 'max_expiration_date='+dates["today_iso"]); // Defaults to today
172
        cy.get("#max_expiration_date_filter").should("have.value", dates["today_iso"]); // Input box reflects default
172
        cy.get("#max_expiration_date_filter").should("have.value", dates["today_iso"]); // Input box reflects default
173
        cy.url().should('include', "/cgi-bin/koha/erm/agreements?by_expired=true"); // Browser url also updated
173
        cy.url().should('include', "/cgi-bin/koha/erm/agreements?by_expired=true&max_expiration_date="+dates["today_iso"]); // Browser url also updated
174
174
175
        // Now test that the url for this particular state works
175
        // Now test that the url for this particular state works
176
        cy.visit("/cgi-bin/koha/erm/agreements?by_expired=true");
176
        cy.visit("/cgi-bin/koha/erm/agreements?by_expired=true&max_expiration_date="+dates["today_iso"]);
177
        cy.wait('@getActiveAgreements').its('request.url').should('include', 'max_expiration_date='+dates["today_iso"]);
177
        cy.wait('@getActiveAgreements').its('request.url').should('include', 'max_expiration_date='+dates["today_iso"]);
178
178
179
        // Now test with a user entered date
179
        // Now test with a user entered date
180
- 

Return to bug 33490