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

(-)a/api/v1/swagger/paths/erm_agreements.yaml (+1 lines)
Lines 68-73 Link Here
68
          type: string
68
          type: string
69
          enum:
69
          enum:
70
            - user_roles
70
            - user_roles
71
            - vendor
71
        collectionFormat: csv
72
        collectionFormat: csv
72
      - $ref: "../swagger.yaml#/parameters/match"
73
      - $ref: "../swagger.yaml#/parameters/match"
73
      - $ref: "../swagger.yaml#/parameters/order_by"
74
      - $ref: "../swagger.yaml#/parameters/order_by"
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-7 / +2 lines)
Lines 95-100 export default { Link Here
95
            building_table: false,
95
            building_table: false,
96
            tableOptions: {
96
            tableOptions: {
97
                columns: this.getTableColumns(),
97
                columns: this.getTableColumns(),
98
                options: { embed: "vendor" },
98
                url: () => this.table_url(),
99
                url: () => this.table_url(),
99
                table_settings: this.agreement_table_settings,
100
                table_settings: this.agreement_table_settings,
100
                add_filters: true,
101
                add_filters: true,
Lines 211-220 export default { Link Here
211
        getTableColumns: function () {
212
        getTableColumns: function () {
212
            let get_lib_from_av = this.get_lib_from_av
213
            let get_lib_from_av = this.get_lib_from_av
213
            let escape_str = this.escape_str
214
            let escape_str = this.escape_str
214
            let vendors_map = this.vendors.reduce((map, e) => {
215
                map[e.id] = e
216
                return map
217
            }, {})
218
215
219
            return [
216
            return [
220
                {
217
                {
Lines 238-246 export default { Link Here
238
                    searchable: true,
235
                    searchable: true,
239
                    orderable: true,
236
                    orderable: true,
240
                    render: function (data, type, row, meta) {
237
                    render: function (data, type, row, meta) {
241
                        return row.vendor_id != undefined
238
                        return row.vendor_id != undefined ? row.vendor.name : ""
242
                            ? row.vendor_id //escape_str(vendors_map[row.vendor_id].name)
243
                            : ""
244
                    },
239
                    },
245
                },
240
                },
246
                {
241
                {
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue (-1 / +1 lines)
Lines 46-51 export default { Link Here
46
                },
46
                },
47
                buttons,
47
                buttons,
48
                default_search: this.$route.query.q,
48
                default_search: this.$route.query.q,
49
                ...this.options,
49
            },
50
            },
50
            hidden_ids,
51
            hidden_ids,
51
            included_ids,
52
            included_ids,
52
- 

Return to bug 33066