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

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue (-3 / +3 lines)
Lines 171-177 Link Here
171
                <fieldset class="action">
171
                <fieldset class="action">
172
                    <input type="submit" value="Submit" />
172
                    <input type="submit" value="Submit" />
173
                    <router-link
173
                    <router-link
174
                        to="/cgi-bin/koha/erm/agreements"
174
                        :to="{ name: 'AgreementsList' }"
175
                        role="button"
175
                        role="button"
176
                        class="cancel"
176
                        class="cancel"
177
                        >{{ $__("Cancel") }}</router-link
177
                        >{{ $__("Cancel") }}</router-link
Lines 386-395 export default { Link Here
386
            fetch(apiUrl, options)
386
            fetch(apiUrl, options)
387
                .then(response => {
387
                .then(response => {
388
                    if (response.status == 200) {
388
                    if (response.status == 200) {
389
                        this.$router.push("/cgi-bin/koha/erm/agreements")
389
                        this.$router.push({ name: 'AgreementsList' })
390
                        setMessage(this.$__("Agreement updated"))
390
                        setMessage(this.$__("Agreement updated"))
391
                    } else if (response.status == 201) {
391
                    } else if (response.status == 201) {
392
                        this.$router.push("/cgi-bin/koha/erm/agreements")
392
                        this.$router.push({ name: 'AgreementsList' })
393
                        setMessage(this.$__("Agreement created"))
393
                        setMessage(this.$__("Agreement created"))
394
                    } else {
394
                    } else {
395
                        setError(response.message || response.statusText)
395
                        setError(response.message || response.statusText)
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue (-2 / +2 lines)
Lines 24-30 Link Here
24
                        :value="$__('Yes, delete')"
24
                        :value="$__('Yes, delete')"
25
                    />
25
                    />
26
                    <router-link
26
                    <router-link
27
                        to="/cgi-bin/koha/erm/agreements"
27
                        :to="{ name: 'AgreementsList' }"
28
                        role="button"
28
                        role="button"
29
                        class="cancel"
29
                        class="cancel"
30
                        >{{ $__("No, do not delete") }}</router-link
30
                        >{{ $__("No, do not delete") }}</router-link
Lines 73-79 export default { Link Here
73
                .then(response => {
73
                .then(response => {
74
                    if (response.status == 204) {
74
                    if (response.status == 204) {
75
                        setMessage(this.$__("Agreement deleted"))
75
                        setMessage(this.$__("Agreement deleted"))
76
                        this.$router.push("/cgi-bin/koha/erm/agreements")
76
                        this.$router.push({ name: 'AgreementsList' })
77
                    } else {
77
                    } else {
78
                        setError(response.message || response.statusText)
78
                        setError(response.message || response.statusText)
79
                    }
79
                    }
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-4 / +7 lines)
Lines 98-113 export default { Link Here
98
            this.initialized = true
98
            this.initialized = true
99
        },
99
        },
100
        show_agreement: function (agreement_id) {
100
        show_agreement: function (agreement_id) {
101
            this.$router.push("/cgi-bin/koha/erm/agreements/" + agreement_id)
101
            this.$router.push(
102
                { name: 'AgreementsShow', params: { agreement_id: agreement_id }}
103
            )
102
        },
104
        },
103
        edit_agreement: function (agreement_id) {
105
        edit_agreement: function (agreement_id) {
104
            this.$router.push(
106
            this.$router.push(
105
                "/cgi-bin/koha/erm/agreements/edit/" + agreement_id
107
                { name: 'AgreementsFormAddEdit', params: { agreement_id: agreement_id }}
106
            )
108
            )
107
        },
109
        },
108
        delete_agreement: function (agreement_id) {
110
        delete_agreement: function (agreement_id) {
109
            this.$router.push(
111
            this.$router.push(
110
                "/cgi-bin/koha/erm/agreements/delete/" + agreement_id
112
                { name: 'AgreementsFormConfirmDelete', params: { agreement_id: agreement_id }}
111
            )
113
            )
112
        },
114
        },
113
        select_agreement: function (agreement_id) {
115
        select_agreement: function (agreement_id) {
Lines 116-123 export default { Link Here
116
        },
118
        },
117
        filter_table: async function () {
119
        filter_table: async function () {
118
            if (this.before_route_entered) {
120
            if (this.before_route_entered) {
121
                let { href } = this.$router.resolve({ name: 'AgreementsList' })
119
                let new_route = build_url(
122
                let new_route = build_url(
120
                    "/cgi-bin/koha/erm/agreements",
123
                    href,
121
                    this.filters
124
                    this.filters
122
                )
125
                )
123
                this.$router.push(new_route)
126
                this.$router.push(new_route)
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue (-5 / +5 lines)
Lines 5-17 Link Here
5
            {{ $__("Agreement #%s").format(agreement.agreement_id) }}
5
            {{ $__("Agreement #%s").format(agreement.agreement_id) }}
6
            <span class="action_links">
6
            <span class="action_links">
7
                <router-link
7
                <router-link
8
                    :to="`/cgi-bin/koha/erm/agreements/edit/${agreement.agreement_id}`"
8
                    :to="{ name: 'AgreementsFormAddEdit', params: { agreement_id: agreement_id } }"
9
                    :title="$__('Edit')"
9
                    :title="$__('Edit')"
10
                    ><i class="fa fa-pencil"></i
10
                    ><i class="fa fa-pencil"></i
11
                ></router-link>
11
                ></router-link>
12
12
13
                <router-link
13
                <router-link
14
                    :to="`/cgi-bin/koha/erm/agreements/delete/${agreement.agreement_id}`"
14
                    :to="{ name: 'AgreementsFormConfirmDelete', params: { agreement_id: agreement_id } }"
15
                    :title="$__('Delete')"
15
                    :title="$__('Delete')"
16
                    ><i class="fa fa-trash"></i
16
                    ><i class="fa fa-trash"></i
17
                ></router-link>
17
                ></router-link>
Lines 196-202 Link Here
196
                            >
196
                            >
197
                                <span
197
                                <span
198
                                    ><router-link
198
                                    ><router-link
199
                                        :to="`/cgi-bin/koha/erm/agreements/${relationship.related_agreement.agreement_id}`"
199
                                        :to="{ name: 'AgreementsShow', params: { agreement_id: relationship.related_agreement.agreement_id } }"
200
                                        >{{
200
                                        >{{
201
                                            relationship.related_agreement.name
201
                                            relationship.related_agreement.name
202
                                        }}</router-link
202
                                        }}</router-link
Lines 237-243 Link Here
237
                                >
237
                                >
238
                                <span v-else
238
                                <span v-else
239
                                    ><router-link
239
                                    ><router-link
240
                                        :to="`/cgi-bin/koha/erm/eholdings/local/packages/${agreement_package.package.package_id}`"
240
                                        :to="{ name: 'EHoldingsLocalPackagesShow', params: { package_id: agreement_package.package.package_id } }"
241
                                        >{{
241
                                        >{{
242
                                            agreement_package.package.name
242
                                            agreement_package.package.name
243
                                        }}</router-link
243
                                        }}</router-link
Lines 288-294 Link Here
288
            </fieldset>
288
            </fieldset>
289
            <fieldset class="action">
289
            <fieldset class="action">
290
                <router-link
290
                <router-link
291
                    to="/cgi-bin/koha/erm/agreements"
291
                    :to="{ name: 'AgreementsList'}"
292
                    role="button"
292
                    role="button"
293
                    class="cancel"
293
                    class="cancel"
294
                    >{{ $__("Close") }}</router-link
294
                    >{{ $__("Close") }}</router-link
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue (-1 / +1 lines)
Lines 1-7 Link Here
1
<template>
1
<template>
2
    <div id="toolbar" class="btn-toolbar">
2
    <div id="toolbar" class="btn-toolbar">
3
        <router-link
3
        <router-link
4
            to="/cgi-bin/koha/erm/agreements/add"
4
            :to="{ name: 'AgreementsFormAdd'}"
5
            class="btn btn-default"
5
            class="btn btn-default"
6
            ><font-awesome-icon icon="plus" />
6
            ><font-awesome-icon icon="plus" />
7
            {{ $__("New agreement") }}</router-link
7
            {{ $__("New agreement") }}</router-link
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue (-1 / +1 lines)
Lines 18-24 Link Here
18
                                <ul>
18
                                <ul>
19
                                    <li>
19
                                    <li>
20
                                        <router-link
20
                                        <router-link
21
                                            to="/cgi-bin/koha/erm/agreements"
21
                                            :to="{ name: 'AgreementsList'}"
22
                                        >
22
                                        >
23
                                            <i class="fa fa-check-circle-o"></i>
23
                                            <i class="fa fa-check-circle-o"></i>
24
                                            {{ $__("Agreements") }}</router-link
24
                                            {{ $__("Agreements") }}</router-link
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js (-1 / +28 lines)
Lines 126-131 export const routes = [ Link Here
126
    },
126
    },
127
    {
127
    {
128
        path: "/cgi-bin/koha/erm/erm.pl",
128
        path: "/cgi-bin/koha/erm/erm.pl",
129
        name: "ERMHome",
129
        component: ERMHome,
130
        component: ERMHome,
130
        meta: {
131
        meta: {
131
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
132
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
Lines 136-141 export const routes = [ Link Here
136
        children: [
137
        children: [
137
            {
138
            {
138
                path: "",
139
                path: "",
140
                name: "AgreementsList",
139
                component: AgreementsList,
141
                component: AgreementsList,
140
                meta: {
142
                meta: {
141
                    breadcrumb: () => breadcrumb_paths.agreements,
143
                    breadcrumb: () => breadcrumb_paths.agreements,
Lines 143-148 export const routes = [ Link Here
143
            },
145
            },
144
            {
146
            {
145
                path: ":agreement_id",
147
                path: ":agreement_id",
148
                name: "AgreementsShow",
146
                component: AgreementsShow,
149
                component: AgreementsShow,
147
                meta: {
150
                meta: {
148
                    breadcrumb: () =>
151
                    breadcrumb: () =>
Lines 154-159 export const routes = [ Link Here
154
            },
157
            },
155
            {
158
            {
156
                path: "delete/:agreement_id",
159
                path: "delete/:agreement_id",
160
                name: "AgreementsFormConfirmDelete",
157
                component: AgreementsFormConfirmDelete,
161
                component: AgreementsFormConfirmDelete,
158
                meta: {
162
                meta: {
159
                    breadcrumb: () =>
163
                    breadcrumb: () =>
Lines 165-170 export const routes = [ Link Here
165
            },
169
            },
166
            {
170
            {
167
                path: "add",
171
                path: "add",
172
                name: "AgreementsFormAdd",
168
                component: AgreementsFormAdd,
173
                component: AgreementsFormAdd,
169
                meta: {
174
                meta: {
170
                    breadcrumb: () =>
175
                    breadcrumb: () =>
Lines 176-181 export const routes = [ Link Here
176
            },
181
            },
177
            {
182
            {
178
                path: "edit/:agreement_id",
183
                path: "edit/:agreement_id",
184
                name: "AgreementsFormAddEdit",
179
                component: AgreementsFormAdd,
185
                component: AgreementsFormAdd,
180
                meta: {
186
                meta: {
181
                    breadcrumb: () =>
187
                    breadcrumb: () =>
Lines 213-218 export const routes = [ Link Here
213
                        children: [
219
                        children: [
214
                            {
220
                            {
215
                                path: "",
221
                                path: "",
222
                                name: "EHoldingsLocalPackagesList",
216
                                component: EHoldingsLocalPackagesList,
223
                                component: EHoldingsLocalPackagesList,
217
                                meta: {
224
                                meta: {
218
                                    breadcrumb: () =>
225
                                    breadcrumb: () =>
Lines 225-230 export const routes = [ Link Here
225
                            },
232
                            },
226
                            {
233
                            {
227
                                path: ":package_id",
234
                                path: ":package_id",
235
                                name: "EHoldingsLocalPackagesShow",
228
                                component: EHoldingsLocalPackagesShow,
236
                                component: EHoldingsLocalPackagesShow,
229
                                meta: {
237
                                meta: {
230
                                    breadcrumb: () =>
238
                                    breadcrumb: () =>
Lines 240-245 export const routes = [ Link Here
240
                            },
248
                            },
241
                            {
249
                            {
242
                                path: "delete/:package_id",
250
                                path: "delete/:package_id",
251
                                name: "EHoldingsLocalPackagesFormConfirmDelete",
243
                                component:
252
                                component:
244
                                    EHoldingsLocalPackagesFormConfirmDelete,
253
                                    EHoldingsLocalPackagesFormConfirmDelete,
245
                                meta: {
254
                                meta: {
Lines 256-261 export const routes = [ Link Here
256
                            },
265
                            },
257
                            {
266
                            {
258
                                path: "add",
267
                                path: "add",
268
                                name: "EHoldingsLocalPackagesFormAdd",
259
                                component: EHoldingsLocalPackagesFormAdd,
269
                                component: EHoldingsLocalPackagesFormAdd,
260
                                meta: {
270
                                meta: {
261
                                    breadcrumb: () =>
271
                                    breadcrumb: () =>
Lines 271-276 export const routes = [ Link Here
271
                            },
281
                            },
272
                            {
282
                            {
273
                                path: "edit/:package_id",
283
                                path: "edit/:package_id",
284
                                name: "EHoldingsLocalPackagesFormAddEdit",
274
                                component: EHoldingsLocalPackagesFormAdd,
285
                                component: EHoldingsLocalPackagesFormAdd,
275
                                meta: {
286
                                meta: {
276
                                    breadcrumb: () =>
287
                                    breadcrumb: () =>
Lines 291-296 export const routes = [ Link Here
291
                        children: [
302
                        children: [
292
                            {
303
                            {
293
                                path: "",
304
                                path: "",
305
                                name: "EHoldingsLocalTitlesList",
294
                                component: EHoldingsLocalTitlesList,
306
                                component: EHoldingsLocalTitlesList,
295
                                meta: {
307
                                meta: {
296
                                    breadcrumb: () =>
308
                                    breadcrumb: () =>
Lines 302-307 export const routes = [ Link Here
302
                            },
314
                            },
303
                            {
315
                            {
304
                                path: ":title_id",
316
                                path: ":title_id",
317
                                name: "EHoldingsLocalTitlesShow",
305
                                component: EHoldingsLocalTitlesShow,
318
                                component: EHoldingsLocalTitlesShow,
306
                                meta: {
319
                                meta: {
307
                                    breadcrumb: () =>
320
                                    breadcrumb: () =>
Lines 317-322 export const routes = [ Link Here
317
                            },
330
                            },
318
                            {
331
                            {
319
                                path: "delete/:title_id",
332
                                path: "delete/:title_id",
333
                                name: "EHoldingsLocalTitlesFormConfirmDelete",
320
                                component:
334
                                component:
321
                                    EHoldingsLocalTitlesFormConfirmDelete,
335
                                    EHoldingsLocalTitlesFormConfirmDelete,
322
                                meta: {
336
                                meta: {
Lines 333-338 export const routes = [ Link Here
333
                            },
347
                            },
334
                            {
348
                            {
335
                                path: "add",
349
                                path: "add",
350
                                name: "EHoldingsLocalTitlesFormAdd",
336
                                component: EHoldingsLocalTitlesFormAdd,
351
                                component: EHoldingsLocalTitlesFormAdd,
337
                                meta: {
352
                                meta: {
338
                                    breadcrumb: () =>
353
                                    breadcrumb: () =>
Lines 348-353 export const routes = [ Link Here
348
                            },
363
                            },
349
                            {
364
                            {
350
                                path: "edit/:title_id",
365
                                path: "edit/:title_id",
366
                                name: "EHoldingsLocalTitlesFormAddEdit",
351
                                component: EHoldingsLocalTitlesFormAdd,
367
                                component: EHoldingsLocalTitlesFormAdd,
352
                                meta: {
368
                                meta: {
353
                                    breadcrumb: () =>
369
                                    breadcrumb: () =>
Lines 363-368 export const routes = [ Link Here
363
                            },
379
                            },
364
                            {
380
                            {
365
                                path: "import",
381
                                path: "import",
382
                                name: "EHoldingsLocalTitlesFormImport",
366
                                component: EHoldingsLocalTitlesFormImport,
383
                                component: EHoldingsLocalTitlesFormImport,
367
                                meta: {
384
                                meta: {
368
                                    breadcrumb: () =>
385
                                    breadcrumb: () =>
Lines 380-385 export const routes = [ Link Here
380
                    },
397
                    },
381
                    {
398
                    {
382
                        path: "resources/:resource_id",
399
                        path: "resources/:resource_id",
400
                        name: "EHoldingsLocalResourcesShow",
383
                        component: EHoldingsLocalResourcesShow,
401
                        component: EHoldingsLocalResourcesShow,
384
                        meta: {
402
                        meta: {
385
                            breadcrumb: () =>
403
                            breadcrumb: () =>
Lines 408-413 export const routes = [ Link Here
408
                        children: [
426
                        children: [
409
                            {
427
                            {
410
                                path: "",
428
                                path: "",
429
                                name: "EHoldingsEBSCOPackagesList",
411
                                component: EHoldingsEBSCOPackagesList,
430
                                component: EHoldingsEBSCOPackagesList,
412
                                meta: {
431
                                meta: {
413
                                    breadcrumb: () =>
432
                                    breadcrumb: () =>
Lines 420-425 export const routes = [ Link Here
420
                            },
439
                            },
421
                            {
440
                            {
422
                                path: ":package_id",
441
                                path: ":package_id",
442
                                name: "EHoldingsEBSCOPackagesShow",
423
                                component: EHoldingsEBSCOPackagesShow,
443
                                component: EHoldingsEBSCOPackagesShow,
424
                                meta: {
444
                                meta: {
425
                                    breadcrumb: () =>
445
                                    breadcrumb: () =>
Lines 440-445 export const routes = [ Link Here
440
                        children: [
460
                        children: [
441
                            {
461
                            {
442
                                path: "",
462
                                path: "",
463
                                name: "EHoldingsEBSCOTitlesList",
443
                                component: EHoldingsEBSCOTitlesList,
464
                                component: EHoldingsEBSCOTitlesList,
444
                                meta: {
465
                                meta: {
445
                                    breadcrumb: () =>
466
                                    breadcrumb: () =>
Lines 451-456 export const routes = [ Link Here
451
                            },
472
                            },
452
                            {
473
                            {
453
                                path: ":title_id",
474
                                path: ":title_id",
475
                                name: "EHoldingsEBSCOTitlesShow",
454
                                component: EHoldingsEBSCOTitlesShow,
476
                                component: EHoldingsEBSCOTitlesShow,
455
                                meta: {
477
                                meta: {
456
                                    breadcrumb: () =>
478
                                    breadcrumb: () =>
Lines 468-473 export const routes = [ Link Here
468
                    },
490
                    },
469
                    {
491
                    {
470
                        path: "resources/:resource_id",
492
                        path: "resources/:resource_id",
493
                        name: "EHoldingsEBSCOResourcesShow",
471
                        component: EHoldingsEBSCOResourcesShow,
494
                        component: EHoldingsEBSCOResourcesShow,
472
                        meta: {
495
                        meta: {
473
                            breadcrumb: () =>
496
                            breadcrumb: () =>
Lines 489-494 export const routes = [ Link Here
489
        children: [
512
        children: [
490
            {
513
            {
491
                path: "",
514
                path: "",
515
                name: "LicensesList",
492
                component: LicensesList,
516
                component: LicensesList,
493
                meta: {
517
                meta: {
494
                    breadcrumb: () => breadcrumb_paths.licenses,
518
                    breadcrumb: () => breadcrumb_paths.licenses,
Lines 496-501 export const routes = [ Link Here
496
            },
520
            },
497
            {
521
            {
498
                path: ":license_id",
522
                path: ":license_id",
523
                name: "LicensesShow",
499
                component: LicensesShow,
524
                component: LicensesShow,
500
                meta: {
525
                meta: {
501
                    breadcrumb: () =>
526
                    breadcrumb: () =>
Lines 507-512 export const routes = [ Link Here
507
            },
532
            },
508
            {
533
            {
509
                path: "delete/:license_id",
534
                path: "delete/:license_id",
535
                name: "LicensesFormConfirmDelete",
510
                component: LicensesFormConfirmDelete,
536
                component: LicensesFormConfirmDelete,
511
                meta: {
537
                meta: {
512
                    breadcrumb: () =>
538
                    breadcrumb: () =>
Lines 518-523 export const routes = [ Link Here
518
            },
544
            },
519
            {
545
            {
520
                path: "add",
546
                path: "add",
547
                name: "LicensesFormAdd",
521
                component: LicensesFormAdd,
548
                component: LicensesFormAdd,
522
                meta: {
549
                meta: {
523
                    breadcrumb: () =>
550
                    breadcrumb: () =>
Lines 529-534 export const routes = [ Link Here
529
            },
556
            },
530
            {
557
            {
531
                path: "edit/:license_id",
558
                path: "edit/:license_id",
559
                name: "LicensesFormAddEdit",
532
                component: LicensesFormAdd,
560
                component: LicensesFormAdd,
533
                meta: {
561
                meta: {
534
                    breadcrumb: () =>
562
                    breadcrumb: () =>
535
- 

Return to bug 32932