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
                    <ButtonSubmit />
172
                    <ButtonSubmit />
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 380-386 export default { Link Here
380
                client.agreements.update(agreement, agreement_id).then(
380
                client.agreements.update(agreement, agreement_id).then(
381
                    success => {
381
                    success => {
382
                        setMessage(this.$__("Agreement updated"))
382
                        setMessage(this.$__("Agreement updated"))
383
                        this.$router.push("/cgi-bin/koha/erm/agreements")
383
                        this.$router.push({ name: "AgreementsList" })
384
                    },
384
                    },
385
                    error => {}
385
                    error => {}
386
                )
386
                )
Lines 388-394 export default { Link Here
388
                client.agreements.create(agreement).then(
388
                client.agreements.create(agreement).then(
389
                    success => {
389
                    success => {
390
                        setMessage(this.$__("Agreement created"))
390
                        setMessage(this.$__("Agreement created"))
391
                        this.$router.push("/cgi-bin/koha/erm/agreements")
391
                        this.$router.push({ name: "AgreementsList" })
392
                    },
392
                    },
393
                    error => {}
393
                    error => {}
394
                )
394
                )
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue (-2 / +2 lines)
Lines 20-26 Link Here
20
                <fieldset class="action">
20
                <fieldset class="action">
21
                    <ButtonSubmit :text="$__('Yes, delete')" />
21
                    <ButtonSubmit :text="$__('Yes, delete')" />
22
                    <router-link
22
                    <router-link
23
                        to="/cgi-bin/koha/erm/agreements"
23
                        :to="{ name: 'AgreementsList' }"
24
                        role="button"
24
                        role="button"
25
                        class="cancel"
25
                        class="cancel"
26
                        >{{ $__("No, do not delete") }}</router-link
26
                        >{{ $__("No, do not delete") }}</router-link
Lines 63-69 export default { Link Here
63
            client.agreements.delete(this.agreement.agreement_id).then(
63
            client.agreements.delete(this.agreement.agreement_id).then(
64
                success => {
64
                success => {
65
                    setMessage(this.$__("Agreement deleted"))
65
                    setMessage(this.$__("Agreement deleted"))
66
                    this.$router.push("/cgi-bin/koha/erm/agreements")
66
                    this.$router.push({ name: "AgreementsList" })
67
                },
67
                },
68
                error => {}
68
                error => {}
69
            )
69
            )
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-11 / +14 lines)
Lines 103-119 export default { Link Here
103
            )
103
            )
104
        },
104
        },
105
        show_agreement: function (agreement_id) {
105
        show_agreement: function (agreement_id) {
106
            this.$router.push("/cgi-bin/koha/erm/agreements/" + agreement_id)
106
            this.$router.push({
107
                name: "AgreementsShow",
108
                params: { agreement_id: agreement_id },
109
            })
107
        },
110
        },
108
        edit_agreement: function (agreement_id) {
111
        edit_agreement: function (agreement_id) {
109
            this.$router.push(
112
            this.$router.push({
110
                "/cgi-bin/koha/erm/agreements/edit/" + agreement_id
113
                name: "AgreementsFormAddEdit",
111
            )
114
                params: { agreement_id: agreement_id },
115
            })
112
        },
116
        },
113
        delete_agreement: function (agreement_id) {
117
        delete_agreement: function (agreement_id) {
114
            this.$router.push(
118
            this.$router.push({
115
                "/cgi-bin/koha/erm/agreements/delete/" + agreement_id
119
                name: "AgreementsFormConfirmDelete",
116
            )
120
                params: { agreement_id: agreement_id },
121
            })
117
        },
122
        },
118
        select_agreement: function (agreement_id) {
123
        select_agreement: function (agreement_id) {
119
            this.$emit("select-agreement", agreement_id)
124
            this.$emit("select-agreement", agreement_id)
Lines 121-130 export default { Link Here
121
        },
126
        },
122
        filter_table: async function () {
127
        filter_table: async function () {
123
            if (this.before_route_entered) {
128
            if (this.before_route_entered) {
124
                let new_route = build_url(
129
                let { href } = this.$router.resolve({ name: "AgreementsList" })
125
                    "/cgi-bin/koha/erm/agreements",
130
                let new_route = build_url(href, this.filters)
126
                    this.filters
127
                )
128
                this.$router.push(new_route)
131
                this.$router.push(new_route)
129
            }
132
            }
130
            if (this.filters.by_expired) {
133
            if (this.filters.by_expired) {
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue (-7 / +41 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="{
9
                        name: 'AgreementsFormAddEdit',
10
                        params: { agreement_id: agreement.agreement_id },
11
                    }"
9
                    :title="$__('Edit')"
12
                    :title="$__('Edit')"
10
                    ><i class="fa fa-pencil"></i
13
                    ><i class="fa fa-pencil"></i
11
                ></router-link>
14
                ></router-link>
12
15
13
                <router-link
16
                <router-link
14
                    :to="`/cgi-bin/koha/erm/agreements/delete/${agreement.agreement_id}`"
17
                    :to="{
18
                        name: 'AgreementsFormConfirmDelete',
19
                        params: { agreement_id: agreement.agreement_id },
20
                    }"
15
                    :title="$__('Delete')"
21
                    :title="$__('Delete')"
16
                    ><i class="fa fa-trash"></i
22
                    ><i class="fa fa-trash"></i
17
                ></router-link>
23
                ></router-link>
Lines 159-165 Link Here
159
                                >
165
                                >
160
                                    <td>
166
                                    <td>
161
                                        <router-link
167
                                        <router-link
162
                                            :to="`/cgi-bin/koha/erm/licenses/${agreement_license.license_id}`"
168
                                            :to="{
169
                                                name: 'LicensesShow',
170
                                                params: {
171
                                                    license_id:
172
                                                        agreement_license.license_id,
173
                                                },
174
                                            }"
163
                                        >
175
                                        >
164
                                            {{ agreement_license.license.name }}
176
                                            {{ agreement_license.license.name }}
165
                                        </router-link>
177
                                        </router-link>
Lines 196-202 Link Here
196
                            >
208
                            >
197
                                <span
209
                                <span
198
                                    ><router-link
210
                                    ><router-link
199
                                        :to="`/cgi-bin/koha/erm/agreements/${relationship.related_agreement.agreement_id}`"
211
                                        :to="{
212
                                            name: 'AgreementsShow',
213
                                            params: {
214
                                                agreement_id:
215
                                                    relationship
216
                                                        .related_agreement
217
                                                        .agreement_id,
218
                                            },
219
                                        }"
200
                                        >{{
220
                                        >{{
201
                                            relationship.related_agreement.name
221
                                            relationship.related_agreement.name
202
                                        }}</router-link
222
                                        }}</router-link
Lines 228-234 Link Here
228
                                    "
248
                                    "
229
                                >
249
                                >
230
                                    <router-link
250
                                    <router-link
231
                                        :to="`/cgi-bin/koha/erm/eholdings/ebsco/packages/${agreement_package.package.external_id}`"
251
                                        :to="{
252
                                            name: 'EHoldingsEBSCOPackagesShow',
253
                                            params: {
254
                                                package_id:
255
                                                    agreement_package.package
256
                                                        .external_id,
257
                                            },
258
                                        }"
232
                                        >{{
259
                                        >{{
233
                                            agreement_package.package.name
260
                                            agreement_package.package.name
234
                                        }}</router-link
261
                                        }}</router-link
Lines 237-243 Link Here
237
                                >
264
                                >
238
                                <span v-else
265
                                <span v-else
239
                                    ><router-link
266
                                    ><router-link
240
                                        :to="`/cgi-bin/koha/erm/eholdings/local/packages/${agreement_package.package.package_id}`"
267
                                        :to="{
268
                                            name: 'EHoldingsLocalPackagesShow',
269
                                            params: {
270
                                                package_id:
271
                                                    agreement_package.package
272
                                                        .package_id,
273
                                            },
274
                                        }"
241
                                        >{{
275
                                        >{{
242
                                            agreement_package.package.name
276
                                            agreement_package.package.name
243
                                        }}</router-link
277
                                        }}</router-link
Lines 288-294 Link Here
288
            </fieldset>
322
            </fieldset>
289
            <fieldset class="action">
323
            <fieldset class="action">
290
                <router-link
324
                <router-link
291
                    to="/cgi-bin/koha/erm/agreements"
325
                    :to="{ name: 'AgreementsList' }"
292
                    role="button"
326
                    role="button"
293
                    class="cancel"
327
                    class="cancel"
294
                    >{{ $__("Close") }}</router-link
328
                    >{{ $__("Close") }}</router-link
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue (-3 / +1 lines)
Lines 1-8 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 :to="{ name: 'AgreementsFormAdd' }" class="btn btn-default"
4
            to="/cgi-bin/koha/erm/agreements/add"
5
            class="btn btn-default"
6
            ><font-awesome-icon icon="plus" />
4
            ><font-awesome-icon icon="plus" />
7
            {{ $__("New agreement") }}</router-link
5
            {{ $__("New agreement") }}</router-link
8
        >
6
        >
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue (-1 / +1 lines)
Lines 21-27 Link Here
21
                                <ul>
21
                                <ul>
22
                                    <li>
22
                                    <li>
23
                                        <router-link
23
                                        <router-link
24
                                            to="/cgi-bin/koha/erm/agreements"
24
                                            :to="{ name: 'AgreementsList' }"
25
                                        >
25
                                        >
26
                                            <i class="fa fa-check-circle-o"></i>
26
                                            <i class="fa fa-check-circle-o"></i>
27
                                            {{ $__("Agreements") }}</router-link
27
                                            {{ $__("Agreements") }}</router-link
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/erm.js (-1 / +28 lines)
Lines 125-130 export const routes = [ Link Here
125
    },
125
    },
126
    {
126
    {
127
        path: "/cgi-bin/koha/erm/erm.pl",
127
        path: "/cgi-bin/koha/erm/erm.pl",
128
        name: "Home"
128
        component: Home,
129
        component: Home,
129
        meta: {
130
        meta: {
130
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
131
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
Lines 135-140 export const routes = [ Link Here
135
        children: [
136
        children: [
136
            {
137
            {
137
                path: "",
138
                path: "",
139
                name: "AgreementsList",
138
                component: AgreementsList,
140
                component: AgreementsList,
139
                meta: {
141
                meta: {
140
                    breadcrumb: () => breadcrumb_paths.agreements,
142
                    breadcrumb: () => breadcrumb_paths.agreements,
Lines 142-147 export const routes = [ Link Here
142
            },
144
            },
143
            {
145
            {
144
                path: ":agreement_id",
146
                path: ":agreement_id",
147
                name: "AgreementsShow",
145
                component: AgreementsShow,
148
                component: AgreementsShow,
146
                meta: {
149
                meta: {
147
                    breadcrumb: () =>
150
                    breadcrumb: () =>
Lines 153-158 export const routes = [ Link Here
153
            },
156
            },
154
            {
157
            {
155
                path: "delete/:agreement_id",
158
                path: "delete/:agreement_id",
159
                name: "AgreementsFormConfirmDelete",
156
                component: AgreementsFormConfirmDelete,
160
                component: AgreementsFormConfirmDelete,
157
                meta: {
161
                meta: {
158
                    breadcrumb: () =>
162
                    breadcrumb: () =>
Lines 164-169 export const routes = [ Link Here
164
            },
168
            },
165
            {
169
            {
166
                path: "add",
170
                path: "add",
171
                name: "AgreementsFormAdd",
167
                component: AgreementsFormAdd,
172
                component: AgreementsFormAdd,
168
                meta: {
173
                meta: {
169
                    breadcrumb: () =>
174
                    breadcrumb: () =>
Lines 175-180 export const routes = [ Link Here
175
            },
180
            },
176
            {
181
            {
177
                path: "edit/:agreement_id",
182
                path: "edit/:agreement_id",
183
                name: "AgreementsFormAddEdit",
178
                component: AgreementsFormAdd,
184
                component: AgreementsFormAdd,
179
                meta: {
185
                meta: {
180
                    breadcrumb: () =>
186
                    breadcrumb: () =>
Lines 212-217 export const routes = [ Link Here
212
                        children: [
218
                        children: [
213
                            {
219
                            {
214
                                path: "",
220
                                path: "",
221
                                name: "EHoldingsLocalPackagesList",
215
                                component: EHoldingsLocalPackagesList,
222
                                component: EHoldingsLocalPackagesList,
216
                                meta: {
223
                                meta: {
217
                                    breadcrumb: () =>
224
                                    breadcrumb: () =>
Lines 224-229 export const routes = [ Link Here
224
                            },
231
                            },
225
                            {
232
                            {
226
                                path: ":package_id",
233
                                path: ":package_id",
234
                                name: "EHoldingsLocalPackagesShow",
227
                                component: EHoldingsLocalPackagesShow,
235
                                component: EHoldingsLocalPackagesShow,
228
                                meta: {
236
                                meta: {
229
                                    breadcrumb: () =>
237
                                    breadcrumb: () =>
Lines 239-244 export const routes = [ Link Here
239
                            },
247
                            },
240
                            {
248
                            {
241
                                path: "delete/:package_id",
249
                                path: "delete/:package_id",
250
                                name: "EHoldingsLocalPackagesFormConfirmDelete",
242
                                component:
251
                                component:
243
                                    EHoldingsLocalPackagesFormConfirmDelete,
252
                                    EHoldingsLocalPackagesFormConfirmDelete,
244
                                meta: {
253
                                meta: {
Lines 255-260 export const routes = [ Link Here
255
                            },
264
                            },
256
                            {
265
                            {
257
                                path: "add",
266
                                path: "add",
267
                                name: "EHoldingsLocalPackagesFormAdd",
258
                                component: EHoldingsLocalPackagesFormAdd,
268
                                component: EHoldingsLocalPackagesFormAdd,
259
                                meta: {
269
                                meta: {
260
                                    breadcrumb: () =>
270
                                    breadcrumb: () =>
Lines 270-275 export const routes = [ Link Here
270
                            },
280
                            },
271
                            {
281
                            {
272
                                path: "edit/:package_id",
282
                                path: "edit/:package_id",
283
                                name: "EHoldingsLocalPackagesFormAddEdit",
273
                                component: EHoldingsLocalPackagesFormAdd,
284
                                component: EHoldingsLocalPackagesFormAdd,
274
                                meta: {
285
                                meta: {
275
                                    breadcrumb: () =>
286
                                    breadcrumb: () =>
Lines 290-295 export const routes = [ Link Here
290
                        children: [
301
                        children: [
291
                            {
302
                            {
292
                                path: "",
303
                                path: "",
304
                                name: "EHoldingsLocalTitlesList",
293
                                component: EHoldingsLocalTitlesList,
305
                                component: EHoldingsLocalTitlesList,
294
                                meta: {
306
                                meta: {
295
                                    breadcrumb: () =>
307
                                    breadcrumb: () =>
Lines 301-306 export const routes = [ Link Here
301
                            },
313
                            },
302
                            {
314
                            {
303
                                path: ":title_id",
315
                                path: ":title_id",
316
                                name: "EHoldingsLocalTitlesShow",
304
                                component: EHoldingsLocalTitlesShow,
317
                                component: EHoldingsLocalTitlesShow,
305
                                meta: {
318
                                meta: {
306
                                    breadcrumb: () =>
319
                                    breadcrumb: () =>
Lines 316-321 export const routes = [ Link Here
316
                            },
329
                            },
317
                            {
330
                            {
318
                                path: "delete/:title_id",
331
                                path: "delete/:title_id",
332
                                name: "EHoldingsLocalTitlesFormConfirmDelete",
319
                                component:
333
                                component:
320
                                    EHoldingsLocalTitlesFormConfirmDelete,
334
                                    EHoldingsLocalTitlesFormConfirmDelete,
321
                                meta: {
335
                                meta: {
Lines 332-337 export const routes = [ Link Here
332
                            },
346
                            },
333
                            {
347
                            {
334
                                path: "add",
348
                                path: "add",
349
                                name: "EHoldingsLocalTitlesFormAdd",
335
                                component: EHoldingsLocalTitlesFormAdd,
350
                                component: EHoldingsLocalTitlesFormAdd,
336
                                meta: {
351
                                meta: {
337
                                    breadcrumb: () =>
352
                                    breadcrumb: () =>
Lines 347-352 export const routes = [ Link Here
347
                            },
362
                            },
348
                            {
363
                            {
349
                                path: "edit/:title_id",
364
                                path: "edit/:title_id",
365
                                name: "EHoldingsLocalTitlesFormAddEdit",
350
                                component: EHoldingsLocalTitlesFormAdd,
366
                                component: EHoldingsLocalTitlesFormAdd,
351
                                meta: {
367
                                meta: {
352
                                    breadcrumb: () =>
368
                                    breadcrumb: () =>
Lines 362-367 export const routes = [ Link Here
362
                            },
378
                            },
363
                            {
379
                            {
364
                                path: "import",
380
                                path: "import",
381
                                name: "EHoldingsLocalTitlesFormImport",
365
                                component: EHoldingsLocalTitlesFormImport,
382
                                component: EHoldingsLocalTitlesFormImport,
366
                                meta: {
383
                                meta: {
367
                                    breadcrumb: () =>
384
                                    breadcrumb: () =>
Lines 379-384 export const routes = [ Link Here
379
                    },
396
                    },
380
                    {
397
                    {
381
                        path: "resources/:resource_id",
398
                        path: "resources/:resource_id",
399
                        name: "EHoldingsLocalResourcesShow",
382
                        component: EHoldingsLocalResourcesShow,
400
                        component: EHoldingsLocalResourcesShow,
383
                        meta: {
401
                        meta: {
384
                            breadcrumb: () =>
402
                            breadcrumb: () =>
Lines 407-412 export const routes = [ Link Here
407
                        children: [
425
                        children: [
408
                            {
426
                            {
409
                                path: "",
427
                                path: "",
428
                                name: "EHoldingsEBSCOPackagesList",
410
                                component: EHoldingsEBSCOPackagesList,
429
                                component: EHoldingsEBSCOPackagesList,
411
                                meta: {
430
                                meta: {
412
                                    breadcrumb: () =>
431
                                    breadcrumb: () =>
Lines 419-424 export const routes = [ Link Here
419
                            },
438
                            },
420
                            {
439
                            {
421
                                path: ":package_id",
440
                                path: ":package_id",
441
                                name: "EHoldingsEBSCOPackagesShow",
422
                                component: EHoldingsEBSCOPackagesShow,
442
                                component: EHoldingsEBSCOPackagesShow,
423
                                meta: {
443
                                meta: {
424
                                    breadcrumb: () =>
444
                                    breadcrumb: () =>
Lines 439-444 export const routes = [ Link Here
439
                        children: [
459
                        children: [
440
                            {
460
                            {
441
                                path: "",
461
                                path: "",
462
                                name: "EHoldingsEBSCOTitlesList",
442
                                component: EHoldingsEBSCOTitlesList,
463
                                component: EHoldingsEBSCOTitlesList,
443
                                meta: {
464
                                meta: {
444
                                    breadcrumb: () =>
465
                                    breadcrumb: () =>
Lines 450-455 export const routes = [ Link Here
450
                            },
471
                            },
451
                            {
472
                            {
452
                                path: ":title_id",
473
                                path: ":title_id",
474
                                name: "EHoldingsEBSCOTitlesShow",
453
                                component: EHoldingsEBSCOTitlesShow,
475
                                component: EHoldingsEBSCOTitlesShow,
454
                                meta: {
476
                                meta: {
455
                                    breadcrumb: () =>
477
                                    breadcrumb: () =>
Lines 467-472 export const routes = [ Link Here
467
                    },
489
                    },
468
                    {
490
                    {
469
                        path: "resources/:resource_id",
491
                        path: "resources/:resource_id",
492
                        name: "EHoldingsEBSCOResourcesShow",
470
                        component: EHoldingsEBSCOResourcesShow,
493
                        component: EHoldingsEBSCOResourcesShow,
471
                        meta: {
494
                        meta: {
472
                            breadcrumb: () =>
495
                            breadcrumb: () =>
Lines 488-493 export const routes = [ Link Here
488
        children: [
511
        children: [
489
            {
512
            {
490
                path: "",
513
                path: "",
514
                name: "LicensesList",
491
                component: LicensesList,
515
                component: LicensesList,
492
                meta: {
516
                meta: {
493
                    breadcrumb: () => breadcrumb_paths.licenses,
517
                    breadcrumb: () => breadcrumb_paths.licenses,
Lines 495-500 export const routes = [ Link Here
495
            },
519
            },
496
            {
520
            {
497
                path: ":license_id",
521
                path: ":license_id",
522
                name: "LicensesShow",
498
                component: LicensesShow,
523
                component: LicensesShow,
499
                meta: {
524
                meta: {
500
                    breadcrumb: () =>
525
                    breadcrumb: () =>
Lines 506-511 export const routes = [ Link Here
506
            },
531
            },
507
            {
532
            {
508
                path: "delete/:license_id",
533
                path: "delete/:license_id",
534
                name: "LicensesFormConfirmDelete",
509
                component: LicensesFormConfirmDelete,
535
                component: LicensesFormConfirmDelete,
510
                meta: {
536
                meta: {
511
                    breadcrumb: () =>
537
                    breadcrumb: () =>
Lines 517-522 export const routes = [ Link Here
517
            },
543
            },
518
            {
544
            {
519
                path: "add",
545
                path: "add",
546
                name: "LicensesFormAdd",
520
                component: LicensesFormAdd,
547
                component: LicensesFormAdd,
521
                meta: {
548
                meta: {
522
                    breadcrumb: () =>
549
                    breadcrumb: () =>
Lines 528-533 export const routes = [ Link Here
528
            },
555
            },
529
            {
556
            {
530
                path: "edit/:license_id",
557
                path: "edit/:license_id",
558
                name: "LicensesFormAddEdit",
531
                component: LicensesFormAdd,
559
                component: LicensesFormAdd,
532
                meta: {
560
                meta: {
533
                    breadcrumb: () =>
561
                    breadcrumb: () =>
534
- 

Return to bug 32932