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

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue (-7 / +6 lines)
Lines 214-228 export default { Link Here
214
                    error => {}
214
                    error => {}
215
                )
215
                )
216
            )
216
            )
217
            return Promise.all(promises)
217
            return Promise.all(promises).then(values => {
218
                this.loaded()
219
                this.initialized = true
220
            })
218
        }
221
        }
219
222
220
        const sysprefs_client = APIClient.sysprefs
223
        const sysprefs_client = APIClient.sysprefs
221
        sysprefs_client.sysprefs
224
        sysprefs_client.sysprefs
222
            .get("ERMModule")
225
            .get("ERMModule")
223
            .then(value => {
226
            .then(value => {
224
                this.ERMModule = value
227
                this.ERMModule = value.value
225
                if (!this.ERMModule) {
228
                if (this.ERMModule == 0) {
226
                    this.loaded()
229
                    this.loaded()
227
                    return this.setError(
230
                    return this.setError(
228
                        this.$__(
231
                        this.$__(
Lines 233-242 export default { Link Here
233
                }
236
                }
234
                return fetch_config()
237
                return fetch_config()
235
            })
238
            })
236
            .then(() => {
237
                this.loaded()
238
                this.initialized = true
239
            })
240
    },
239
    },
241
    components: {
240
    components: {
242
        Breadcrumb,
241
        Breadcrumb,
(-)a/t/cypress/integration/ERM/Agreements_spec.ts (-5 / +2 lines)
Lines 117-130 function get_licenses_to_relate() { Link Here
117
}
117
}
118
118
119
describe("Agreement CRUD operations", () => {
119
describe("Agreement CRUD operations", () => {
120
    before(() => {
121
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
122
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
123
    });
124
125
    beforeEach(() => {
120
    beforeEach(() => {
126
        cy.login();
121
        cy.login();
127
        cy.title().should("eq", "Koha staff interface");
122
        cy.title().should("eq", "Koha staff interface");
123
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
124
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
128
    });
125
    });
129
126
130
    it("List agreements", () => {
127
    it("List agreements", () => {
(-)a/t/cypress/integration/ERM/Dialog_spec.ts (-5 / +2 lines)
Lines 22-35 function get_package() { Link Here
22
}
22
}
23
23
24
describe("Dialog operations", () => {
24
describe("Dialog operations", () => {
25
    before(() => {
26
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
27
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
28
    });
29
30
    beforeEach(() => {
25
    beforeEach(() => {
31
        cy.login();
26
        cy.login();
32
        cy.title().should("eq", "Koha staff interface");
27
        cy.title().should("eq", "Koha staff interface");
28
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
29
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
33
    });
30
    });
34
31
35
    it("There are no ... defined", () => {
32
    it("There are no ... defined", () => {
(-)a/t/cypress/integration/ERM/Licenses_spec.ts (-5 / +2 lines)
Lines 33-46 function get_license() { Link Here
33
}
33
}
34
34
35
describe("License CRUD operations", () => {
35
describe("License CRUD operations", () => {
36
    before(() => {
37
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
38
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
39
    });
40
41
    beforeEach(() => {
36
    beforeEach(() => {
42
        cy.login();
37
        cy.login();
43
        cy.title().should("eq", "Koha staff interface");
38
        cy.title().should("eq", "Koha staff interface");
39
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
40
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
44
    });
41
    });
45
42
46
    it("List license", () => {
43
    it("List license", () => {
(-)a/t/cypress/integration/ERM/Packages_spec.ts (-5 / +2 lines)
Lines 24-37 function get_package() { Link Here
24
}
24
}
25
25
26
describe("Package CRUD operations", () => {
26
describe("Package CRUD operations", () => {
27
    before(() => {
28
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
29
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
30
    });
31
32
    beforeEach(() => {
27
    beforeEach(() => {
33
        cy.login();
28
        cy.login();
34
        cy.title().should("eq", "Koha staff interface");
29
        cy.title().should("eq", "Koha staff interface");
30
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
31
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
35
    });
32
    });
36
33
37
    it("List package", () => {
34
    it("List package", () => {
(-)a/t/cypress/integration/ERM/Titles_spec.ts (-6 / +2 lines)
Lines 18-31 function get_packages_to_relate() { Link Here
18
}
18
}
19
19
20
describe("Title CRUD operations", () => {
20
describe("Title CRUD operations", () => {
21
    before(() => {
22
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
23
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
24
    });
25
26
    beforeEach(() => {
21
    beforeEach(() => {
27
        cy.login();
22
        cy.login();
28
        cy.title().should("eq", "Koha staff interface");
23
        cy.title().should("eq", "Koha staff interface");
24
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule", '{"value":"1"}');
25
        cy.intercept("GET", "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders", '{"value":"local"}');
29
    });
26
    });
30
27
31
    it("Import titles", () => {
28
    it("Import titles", () => {
32
- 

Return to bug 33408