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 167-173 Link Here
167
                <fieldset class="action">
167
                <fieldset class="action">
168
                    <ButtonSubmit />
168
                    <ButtonSubmit />
169
                    <router-link
169
                    <router-link
170
                        to="/cgi-bin/koha/erm/agreements"
170
                        :to="{ name: 'AgreementsList' }"
171
                        role="button"
171
                        role="button"
172
                        class="cancel"
172
                        class="cancel"
173
                        >{{ $__("Cancel") }}</router-link
173
                        >{{ $__("Cancel") }}</router-link
Lines 376-382 export default { Link Here
376
                client.agreements.update(agreement, agreement_id).then(
376
                client.agreements.update(agreement, agreement_id).then(
377
                    success => {
377
                    success => {
378
                        setMessage(this.$__("Agreement updated"))
378
                        setMessage(this.$__("Agreement updated"))
379
                        this.$router.push("/cgi-bin/koha/erm/agreements")
379
                        this.$router.push({ name: "AgreementsList" })
380
                    },
380
                    },
381
                    error => {}
381
                    error => {}
382
                )
382
                )
Lines 384-390 export default { Link Here
384
                client.agreements.create(agreement).then(
384
                client.agreements.create(agreement).then(
385
                    success => {
385
                    success => {
386
                        setMessage(this.$__("Agreement created"))
386
                        setMessage(this.$__("Agreement created"))
387
                        this.$router.push("/cgi-bin/koha/erm/agreements")
387
                        this.$router.push({ name: "AgreementsList" })
388
                    },
388
                    },
389
                    error => {}
389
                    error => {}
390
                )
390
                )
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-8 / +10 lines)
Lines 117-128 export default { Link Here
117
            )
117
            )
118
        },
118
        },
119
        show_agreement: function (agreement_id) {
119
        show_agreement: function (agreement_id) {
120
            this.$router.push("/cgi-bin/koha/erm/agreements/" + agreement_id)
120
            this.$router.push({
121
                name: "AgreementsShow",
122
                params: { agreement_id: agreement_id },
123
            })
121
        },
124
        },
122
        edit_agreement: function (agreement_id) {
125
        edit_agreement: function (agreement_id) {
123
            this.$router.push(
126
            this.$router.push({
124
                "/cgi-bin/koha/erm/agreements/edit/" + agreement_id
127
                name: "AgreementsFormAddEdit",
125
            )
128
                params: { agreement_id: agreement_id },
129
            })
126
        },
130
        },
127
        delete_agreement: function (agreement_id, agreement_name) {
131
        delete_agreement: function (agreement_id, agreement_name) {
128
            this.setConfirmationDialog(
132
            this.setConfirmationDialog(
Lines 163-172 export default { Link Here
163
        },
167
        },
164
        filter_table: async function () {
168
        filter_table: async function () {
165
            if (this.before_route_entered) {
169
            if (this.before_route_entered) {
166
                let new_route = build_url(
170
                let { href } = this.$router.resolve({ name: "AgreementsList" })
167
                    "/cgi-bin/koha/erm/agreements",
171
                let new_route = build_url(href, this.filters)
168
                    this.filters
169
                )
170
                this.$router.push(new_route)
172
                this.$router.push(new_route)
171
            }
173
            }
172
            if (this.filters.by_expired) {
174
            if (this.filters.by_expired) {
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue (-7 / +38 lines)
Lines 5-11 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>
Lines 159-165 Link Here
159
                                >
162
                                >
160
                                    <td>
163
                                    <td>
161
                                        <router-link
164
                                        <router-link
162
                                            :to="`/cgi-bin/koha/erm/licenses/${agreement_license.license_id}`"
165
                                            :to="{
166
                                                name: 'LicensesShow',
167
                                                params: {
168
                                                    license_id:
169
                                                        agreement_license.license_id,
170
                                                },
171
                                            }"
163
                                        >
172
                                        >
164
                                            {{ agreement_license.license.name }}
173
                                            {{ agreement_license.license.name }}
165
                                        </router-link>
174
                                        </router-link>
Lines 196-202 Link Here
196
                            >
205
                            >
197
                                <span
206
                                <span
198
                                    ><router-link
207
                                    ><router-link
199
                                        :to="`/cgi-bin/koha/erm/agreements/${relationship.related_agreement.agreement_id}`"
208
                                        :to="{
209
                                            name: 'AgreementsShow',
210
                                            params: {
211
                                                agreement_id:
212
                                                    relationship
213
                                                        .related_agreement
214
                                                        .agreement_id,
215
                                            },
216
                                        }"
200
                                        >{{
217
                                        >{{
201
                                            relationship.related_agreement.name
218
                                            relationship.related_agreement.name
202
                                        }}</router-link
219
                                        }}</router-link
Lines 228-234 Link Here
228
                                    "
245
                                    "
229
                                >
246
                                >
230
                                    <router-link
247
                                    <router-link
231
                                        :to="`/cgi-bin/koha/erm/eholdings/ebsco/packages/${agreement_package.package.external_id}`"
248
                                        :to="{
249
                                            name: 'EHoldingsEBSCOPackagesShow',
250
                                            params: {
251
                                                package_id:
252
                                                    agreement_package.package
253
                                                        .external_id,
254
                                            },
255
                                        }"
232
                                        >{{
256
                                        >{{
233
                                            agreement_package.package.name
257
                                            agreement_package.package.name
234
                                        }}</router-link
258
                                        }}</router-link
Lines 237-243 Link Here
237
                                >
261
                                >
238
                                <span v-else
262
                                <span v-else
239
                                    ><router-link
263
                                    ><router-link
240
                                        :to="`/cgi-bin/koha/erm/eholdings/local/packages/${agreement_package.package.package_id}`"
264
                                        :to="{
265
                                            name: 'EHoldingsLocalPackagesShow',
266
                                            params: {
267
                                                package_id:
268
                                                    agreement_package.package
269
                                                        .package_id,
270
                                            },
271
                                        }"
241
                                        >{{
272
                                        >{{
242
                                            agreement_package.package.name
273
                                            agreement_package.package.name
243
                                        }}</router-link
274
                                        }}</router-link
Lines 288-294 Link Here
288
            </fieldset>
319
            </fieldset>
289
            <fieldset class="action">
320
            <fieldset class="action">
290
                <router-link
321
                <router-link
291
                    to="/cgi-bin/koha/erm/agreements"
322
                    :to="{ name: 'AgreementsList' }"
292
                    role="button"
323
                    role="button"
293
                    class="cancel"
324
                    class="cancel"
294
                    >{{ $__("Close") }}</router-link
325
                    >{{ $__("Close") }}</router-link
Lines 379-385 export default { Link Here
379
                                ),
410
                                ),
380
                                true
411
                                true
381
                            )
412
                            )
382
                            this.$router.push("/cgi-bin/koha/erm/agreements")
413
                            this.$router.push({ name: 'AgreementsList' })
383
                        },
414
                        },
384
                        error => {}
415
                        error => {}
385
                    )
416
                    )
(-)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/Main.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/erm.js (-1 / +24 lines)
Lines 121-126 export const routes = [ Link Here
121
    },
121
    },
122
    {
122
    {
123
        path: "/cgi-bin/koha/erm/erm.pl",
123
        path: "/cgi-bin/koha/erm/erm.pl",
124
        name: "Home",
124
        component: Home,
125
        component: Home,
125
        meta: {
126
        meta: {
126
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
127
            breadcrumb: () => [breadcrumbs.home, breadcrumbs.erm_home],
Lines 131-136 export const routes = [ Link Here
131
        children: [
132
        children: [
132
            {
133
            {
133
                path: "",
134
                path: "",
135
                name: "AgreementsList",
134
                component: AgreementsList,
136
                component: AgreementsList,
135
                meta: {
137
                meta: {
136
                    breadcrumb: () => breadcrumb_paths.agreements,
138
                    breadcrumb: () => breadcrumb_paths.agreements,
Lines 138-143 export const routes = [ Link Here
138
            },
140
            },
139
            {
141
            {
140
                path: ":agreement_id",
142
                path: ":agreement_id",
143
                name: "AgreementsShow",
141
                component: AgreementsShow,
144
                component: AgreementsShow,
142
                meta: {
145
                meta: {
143
                    breadcrumb: () =>
146
                    breadcrumb: () =>
Lines 149-154 export const routes = [ Link Here
149
            },
152
            },
150
            {
153
            {
151
                path: "add",
154
                path: "add",
155
                name: "AgreementsFormAdd",
152
                component: AgreementsFormAdd,
156
                component: AgreementsFormAdd,
153
                meta: {
157
                meta: {
154
                    breadcrumb: () =>
158
                    breadcrumb: () =>
Lines 160-165 export const routes = [ Link Here
160
            },
164
            },
161
            {
165
            {
162
                path: "edit/:agreement_id",
166
                path: "edit/:agreement_id",
167
                name: "AgreementsFormAddEdit",
163
                component: AgreementsFormAdd,
168
                component: AgreementsFormAdd,
164
                meta: {
169
                meta: {
165
                    breadcrumb: () =>
170
                    breadcrumb: () =>
Lines 197-202 export const routes = [ Link Here
197
                        children: [
202
                        children: [
198
                            {
203
                            {
199
                                path: "",
204
                                path: "",
205
                                name: "EHoldingsLocalPackagesList",
200
                                component: EHoldingsLocalPackagesList,
206
                                component: EHoldingsLocalPackagesList,
201
                                meta: {
207
                                meta: {
202
                                    breadcrumb: () =>
208
                                    breadcrumb: () =>
Lines 209-214 export const routes = [ Link Here
209
                            },
215
                            },
210
                            {
216
                            {
211
                                path: ":package_id",
217
                                path: ":package_id",
218
                                name: "EHoldingsLocalPackagesShow",
212
                                component: EHoldingsLocalPackagesShow,
219
                                component: EHoldingsLocalPackagesShow,
213
                                meta: {
220
                                meta: {
214
                                    breadcrumb: () =>
221
                                    breadcrumb: () =>
Lines 224-229 export const routes = [ Link Here
224
                            },
231
                            },
225
                            {
232
                            {
226
                                path: "add",
233
                                path: "add",
234
                                name: "EHoldingsLocalPackagesFormAdd",
227
                                component: EHoldingsLocalPackagesFormAdd,
235
                                component: EHoldingsLocalPackagesFormAdd,
228
                                meta: {
236
                                meta: {
229
                                    breadcrumb: () =>
237
                                    breadcrumb: () =>
Lines 239-244 export const routes = [ Link Here
239
                            },
247
                            },
240
                            {
248
                            {
241
                                path: "edit/:package_id",
249
                                path: "edit/:package_id",
250
                                name: "EHoldingsLocalPackagesFormAddEdit",
242
                                component: EHoldingsLocalPackagesFormAdd,
251
                                component: EHoldingsLocalPackagesFormAdd,
243
                                meta: {
252
                                meta: {
244
                                    breadcrumb: () =>
253
                                    breadcrumb: () =>
Lines 259-264 export const routes = [ Link Here
259
                        children: [
268
                        children: [
260
                            {
269
                            {
261
                                path: "",
270
                                path: "",
271
                                name: "EHoldingsLocalTitlesList",
262
                                component: EHoldingsLocalTitlesList,
272
                                component: EHoldingsLocalTitlesList,
263
                                meta: {
273
                                meta: {
264
                                    breadcrumb: () =>
274
                                    breadcrumb: () =>
Lines 270-275 export const routes = [ Link Here
270
                            },
280
                            },
271
                            {
281
                            {
272
                                path: ":title_id",
282
                                path: ":title_id",
283
                                name: "EHoldingsLocalTitlesShow",
273
                                component: EHoldingsLocalTitlesShow,
284
                                component: EHoldingsLocalTitlesShow,
274
                                meta: {
285
                                meta: {
275
                                    breadcrumb: () =>
286
                                    breadcrumb: () =>
Lines 285-290 export const routes = [ Link Here
285
                            },
296
                            },
286
                            {
297
                            {
287
                                path: "add",
298
                                path: "add",
299
                                name: "EHoldingsLocalTitlesFormAdd",
288
                                component: EHoldingsLocalTitlesFormAdd,
300
                                component: EHoldingsLocalTitlesFormAdd,
289
                                meta: {
301
                                meta: {
290
                                    breadcrumb: () =>
302
                                    breadcrumb: () =>
Lines 300-305 export const routes = [ Link Here
300
                            },
312
                            },
301
                            {
313
                            {
302
                                path: "edit/:title_id",
314
                                path: "edit/:title_id",
315
                                name: "EHoldingsLocalTitlesFormAddEdit",
303
                                component: EHoldingsLocalTitlesFormAdd,
316
                                component: EHoldingsLocalTitlesFormAdd,
304
                                meta: {
317
                                meta: {
305
                                    breadcrumb: () =>
318
                                    breadcrumb: () =>
Lines 315-320 export const routes = [ Link Here
315
                            },
328
                            },
316
                            {
329
                            {
317
                                path: "import",
330
                                path: "import",
331
                                name: "EHoldingsLocalTitlesFormImport",
318
                                component: EHoldingsLocalTitlesFormImport,
332
                                component: EHoldingsLocalTitlesFormImport,
319
                                meta: {
333
                                meta: {
320
                                    breadcrumb: () =>
334
                                    breadcrumb: () =>
Lines 332-337 export const routes = [ Link Here
332
                    },
346
                    },
333
                    {
347
                    {
334
                        path: "resources/:resource_id",
348
                        path: "resources/:resource_id",
349
                        name: "EHoldingsLocalResourcesShow",
335
                        component: EHoldingsLocalResourcesShow,
350
                        component: EHoldingsLocalResourcesShow,
336
                        meta: {
351
                        meta: {
337
                            breadcrumb: () =>
352
                            breadcrumb: () =>
Lines 360-365 export const routes = [ Link Here
360
                        children: [
375
                        children: [
361
                            {
376
                            {
362
                                path: "",
377
                                path: "",
378
                                name: "EHoldingsEBSCOPackagesList",
363
                                component: EHoldingsEBSCOPackagesList,
379
                                component: EHoldingsEBSCOPackagesList,
364
                                meta: {
380
                                meta: {
365
                                    breadcrumb: () =>
381
                                    breadcrumb: () =>
Lines 372-377 export const routes = [ Link Here
372
                            },
388
                            },
373
                            {
389
                            {
374
                                path: ":package_id",
390
                                path: ":package_id",
391
                                name: "EHoldingsEBSCOPackagesShow",
375
                                component: EHoldingsEBSCOPackagesShow,
392
                                component: EHoldingsEBSCOPackagesShow,
376
                                meta: {
393
                                meta: {
377
                                    breadcrumb: () =>
394
                                    breadcrumb: () =>
Lines 392-397 export const routes = [ Link Here
392
                        children: [
409
                        children: [
393
                            {
410
                            {
394
                                path: "",
411
                                path: "",
412
                                name: "EHoldingsEBSCOTitlesList",
395
                                component: EHoldingsEBSCOTitlesList,
413
                                component: EHoldingsEBSCOTitlesList,
396
                                meta: {
414
                                meta: {
397
                                    breadcrumb: () =>
415
                                    breadcrumb: () =>
Lines 403-408 export const routes = [ Link Here
403
                            },
421
                            },
404
                            {
422
                            {
405
                                path: ":title_id",
423
                                path: ":title_id",
424
                                name: "EHoldingsEBSCOTitlesShow",
406
                                component: EHoldingsEBSCOTitlesShow,
425
                                component: EHoldingsEBSCOTitlesShow,
407
                                meta: {
426
                                meta: {
408
                                    breadcrumb: () =>
427
                                    breadcrumb: () =>
Lines 420-425 export const routes = [ Link Here
420
                    },
439
                    },
421
                    {
440
                    {
422
                        path: "resources/:resource_id",
441
                        path: "resources/:resource_id",
442
                        name: "EHoldingsEBSCOResourcesShow",
423
                        component: EHoldingsEBSCOResourcesShow,
443
                        component: EHoldingsEBSCOResourcesShow,
424
                        meta: {
444
                        meta: {
425
                            breadcrumb: () =>
445
                            breadcrumb: () =>
Lines 441-446 export const routes = [ Link Here
441
        children: [
461
        children: [
442
            {
462
            {
443
                path: "",
463
                path: "",
464
                name: "LicensesList",
444
                component: LicensesList,
465
                component: LicensesList,
445
                meta: {
466
                meta: {
446
                    breadcrumb: () => breadcrumb_paths.licenses,
467
                    breadcrumb: () => breadcrumb_paths.licenses,
Lines 448-453 export const routes = [ Link Here
448
            },
469
            },
449
            {
470
            {
450
                path: ":license_id",
471
                path: ":license_id",
472
                name: "LicensesShow",
451
                component: LicensesShow,
473
                component: LicensesShow,
452
                meta: {
474
                meta: {
453
                    breadcrumb: () =>
475
                    breadcrumb: () =>
Lines 459-464 export const routes = [ Link Here
459
            },
481
            },
460
            {
482
            {
461
                path: "add",
483
                path: "add",
484
                name: "LicensesFormAdd",
462
                component: LicensesFormAdd,
485
                component: LicensesFormAdd,
463
                meta: {
486
                meta: {
464
                    breadcrumb: () =>
487
                    breadcrumb: () =>
Lines 470-475 export const routes = [ Link Here
470
            },
493
            },
471
            {
494
            {
472
                path: "edit/:license_id",
495
                path: "edit/:license_id",
496
                name: "LicensesFormAddEdit",
473
                component: LicensesFormAdd,
497
                component: LicensesFormAdd,
474
                meta: {
498
                meta: {
475
                    breadcrumb: () =>
499
                    breadcrumb: () =>
476
- 

Return to bug 32932