From: Linda Nichols Date: Sun, 24 Aug 2014 22:24:07 +0000 (+0000) Subject: fixed customer type search on customer list X-Git-Tag: v4.7.0-beta.2~50^2~3 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=f07db48b5e8cbd0750af2edcd7bf10975a4d2e5b;p=xtuple fixed customer type search on customer list --- diff --git a/enyo-client/application/source/views/list.js b/enyo-client/application/source/views/list.js index aa5b9730b..6e24b314f 100644 --- a/enyo-client/application/source/views/list.js +++ b/enyo-client/application/source/views/list.js @@ -690,10 +690,13 @@ trailing:true, white:true, strict: false*/ {kind: "XV.ListAttr", attr: "billingContact.phone", }, {kind: "XV.ListAttr", attr: "billingContact.primaryEmail"} ]}, - {kind: "XV.ListColumn", fit: true, components: [ + {kind: "XV.ListColumn", classes: "descr", components: [ {kind: "XV.ListAttr", attr: "billingContact.name", placeholder: "_noContact".loc()}, {kind: "XV.ListAttr", attr: "billingContact.address"} + ]}, + {kind: "XV.ListColumn", fit: true, components: [ + {kind: "XV.ListAttr", attr: "customerType"} ]} ]} ]} @@ -2531,7 +2534,7 @@ trailing:true, white:true, strict: false*/ ]} ] }); - + XV.registerModelList("XM.UserAccountRelation", "XV.UserAccountList"); // .......................................................... diff --git a/enyo-client/database/orm/models/customer.json b/enyo-client/database/orm/models/customer.json index ae86963d5..5e9678f19 100644 --- a/enyo-client/database/orm/models/customer.json +++ b/enyo-client/database/orm/models/customer.json @@ -2329,6 +2329,13 @@ "type": "ContactRelation", "column": "cust_cntct_id" } + }, + { + "name": "customerType", + "toOne": { + "type": "CustomerType", + "column": "type" + } } ], "extensions": [