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

(-)a/Koha/Schema/Result/ErmAgreement.pm (+7 lines)
Lines 277-282 __PACKAGE__->has_many( Link Here
277
  { cascade_copy => 0, cascade_delete => 0 },
277
  { cascade_copy => 0, cascade_delete => 0 },
278
);
278
);
279
279
280
__PACKAGE__->has_many(
281
  "agreement_packages",
282
  "Koha::Schema::Result::ErmEholdingsPackagesAgreement",
283
  { "foreign.agreement_id" => "self.agreement_id" },
284
  { cascade_copy => 0, cascade_delete => 0 },
285
);
286
280
__PACKAGE__->add_columns(
287
__PACKAGE__->add_columns(
281
    '+is_perpetual' => { is_boolean => 1 }
288
    '+is_perpetual' => { is_boolean => 1 }
282
);
289
);
(-)a/api/v1/swagger/definitions/erm_agreement.yaml (+5 lines)
Lines 54-59 properties: Link Here
54
    description: agreement relationships
54
    description: agreement relationships
55
    items:
55
    items:
56
      $ref: erm_agreement_relationship.yaml
56
      $ref: erm_agreement_relationship.yaml
57
  agreement_packages:
58
    type: array
59
    description: agreement packages
60
    items:
61
      $ref: erm_eholdings_package_agreement.yaml
57
  agreement_licenses:
62
  agreement_licenses:
58
    type: array
63
    type: array
59
    description: agreement licenses
64
    description: agreement licenses
(-)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
            - agreement_packages
71
            - vendor
72
            - vendor
72
        collectionFormat: csv
73
        collectionFormat: csv
73
      - $ref: "../swagger.yaml#/parameters/match"
74
      - $ref: "../swagger.yaml#/parameters/match"
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-1 / +3 lines)
Lines 221-226 export default { Link Here
221
                )
221
                )
222
                this.$router.push(new_route)
222
                this.$router.push(new_route)
223
            }
223
            }
224
            //TODO: If embedded, apply default filter for agreements not related to currently shown package
225
            // tried, but failed:
226
            // curl -u koha:koha --request GET 'http://localhost:8081/api/v1/erm/agreements' --header "x-koha-embed: agreement_packages" --header "Content-Type: application/json" --data-raw '{ "agreement_packages.package_id": { "!=": 1 } }'
224
            if (this.filters.by_expired) {
227
            if (this.filters.by_expired) {
225
                if (!this.filters.max_expiration_date)
228
                if (!this.filters.max_expiration_date)
226
                    this.filters.max_expiration_date = new Date()
229
                    this.filters.max_expiration_date = new Date()
227
- 

Return to bug 33507