Bugzilla – Attachment 155547 Details for
Bug 34762
Add a search based select component to ERM
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34762: DO NOT PUSH: Example usage commit
Bug-34762-DO-NOT-PUSH-Example-usage-commit.patch (text/plain), 6.14 KB, created by
Matt Blenkinsop
on 2023-09-12 10:24:33 UTC
(
hide
)
Description:
Bug 34762: DO NOT PUSH: Example usage commit
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2023-09-12 10:24:33 UTC
Size:
6.14 KB
patch
obsolete
>From de53240c7d14bcbb38883d4b6d7ce4aaeb0edf6d Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Tue, 12 Sep 2023 10:14:15 +0000 >Subject: [PATCH] Bug 34762: DO NOT PUSH: Example usage commit > >This commit loads the SearchSelect component into three locations as an example for the test plan and should not be pushed >--- > .../vue/components/ERM/AgreementLicenses.vue | 18 ++++++++++++++++-- > .../components/ERM/AgreementRelationships.vue | 18 ++++++++++++++++-- > .../vue/components/ERM/AgreementsFormAdd.vue | 14 +++++++++++++- > 3 files changed, 45 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >index 665be1f2ef..44357dc780 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue >@@ -19,7 +19,7 @@ > <label :for="`license_id_${counter}`" class="required" > >{{ $__("License") }}:</label > > >- <v-select >+ <!-- <v-select > :id="`license_id_${counter}`" > v-model="agreement_license.license_id" > label="name" >@@ -34,7 +34,17 @@ > v-on="events" > /> > </template> >- </v-select> >+ </v-select> --> >+ <SearchSelect >+ :required="true" >+ dataType="licenses" >+ v-model="agreement_license.license_id" >+ dataIdentifier="license_id" >+ label="name" >+ :numberOfCharacters="1" >+ searchField="name" >+ APIClientType="erm" >+ /> > <span class="required">{{ $__("Required") }}</span> > </li> > <li> >@@ -102,6 +112,7 @@ > > <script> > import { APIClient } from "../../fetch/api-client.js" >+import SearchSelect from "../SearchSelect.vue" > > export default { > name: "AgreementLicenses", >@@ -139,5 +150,8 @@ export default { > this.agreement_licenses.splice(counter, 1) > }, > }, >+ components: { >+ SearchSelect, >+ }, > } > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >index e23d43416c..e7fd32e164 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementRelationships.vue >@@ -21,7 +21,7 @@ > class="required" > >{{ $__("Related agreement") }}: > </label> >- <v-select >+ <!-- <v-select > :id="`related_agreement_id_${counter}`" > v-model="relationship.related_agreement_id" > label="name" >@@ -36,7 +36,17 @@ > v-on="events" > /> > </template> >- </v-select> >+ </v-select> --> >+ <SearchSelect >+ :required="true" >+ dataType="agreements" >+ v-model="relationship.related_agreement_id" >+ dataIdentifier="agreement_id" >+ label="name" >+ :numberOfCharacters="2" >+ searchField="name" >+ APIClientType="erm" >+ /> > <span class="required">{{ $__("Required") }}</span> > </li> > <li> >@@ -90,6 +100,7 @@ > > <script> > import { APIClient } from "../../fetch/api-client.js" >+import SearchSelect from "../SearchSelect.vue" > > export default { > data() { >@@ -127,5 +138,8 @@ export default { > relationships: Array, > }, > name: "AgreementRelationships", >+ components: { >+ SearchSelect, >+ }, > } > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >index 645a13b5be..b24f9fdc70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue >@@ -25,9 +25,19 @@ > <label for="agreement_vendor_id" > >{{ $__("Vendor") }}:</label > > >- <FormSelectVendors >+ <!-- <FormSelectVendors > id="agreement_vendor_id" > v-model="agreement.vendor_id" >+ /> --> >+ <SearchSelect >+ :required="false" >+ dataType="vendors" >+ v-model="agreement.vendor_id" >+ dataIdentifier="id" >+ label="name" >+ :numberOfCharacters="1" >+ searchField="name" >+ APIClientType="acquisition" > /> > </li> > <li> >@@ -178,6 +188,7 @@ import ButtonSubmit from "../ButtonSubmit.vue" > import FormSelectVendors from "../FormSelectVendors.vue" > import { setMessage, setError, setWarning } from "../../messages" > import { APIClient } from "../../fetch/api-client.js" >+import SearchSelect from "../SearchSelect.vue" > import { storeToRefs } from "pinia" > > export default { >@@ -397,6 +408,7 @@ export default { > Documents, > ButtonSubmit, > FormSelectVendors, >+ SearchSelect, > }, > name: "AgreementsFormAdd", > } >-- >2.37.1 (Apple Git-137.1)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34762
:
155545
|
155546
|
155547
|
155549
|
155620