svn commit: r1757994 - in /ofbiz/trunk/applications: datamodel/entitydef/party-entitymodel.xml party/widget/partymgr/PartyForms.xml

[ashish-18]

Author: ashish
Date: Sat Aug 27 11:38:26 2016
New Revision: 1757994

URL: http://svn.apache.org/viewvc?rev=1757994&view=rev
Log:
Applied patch from jira issue - OFBIZ-7820 - Empty scroll bar in party component.
Thanks Akshay for the contribution.

Modified:
    ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml

Modified: ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1757994&r1=1757993&r2=1757994&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/party-entitymodel.xml Sat Aug 27 11:38:26 2016
@@ -2985,5 +2985,15 @@ under the License.
         </view-link>
     </view-entity>
     
+    <view-entity entity-name="PartyClassificationGroupAndType" package-name="org.ofbiz.party.party" title="PartyClassificationGroup and PartyClassificationTypeView">
+        <member-entity entity-alias="PCG" entity-name="PartyClassificationGroup"/>
+        <member-entity entity-alias="PCT" entity-name="PartyClassificationType"/>
+        <alias-all entity-alias="PCG"/>
+        <alias entity-alias="PCT" name="typeDescription" field="description"/>
+        <alias entity-alias="PCT" name="parentTypeId"/>
+        <view-link entity-alias="PCG" rel-entity-alias="PCT">
+            <key-map field-name="partyClassificationTypeId"/>
+        </view-link>
+    </view-entity>
     
 </entitymodel>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1757994&r1=1757993&r2=1757994&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Aug 27 11:38:26 2016
@@ -78,9 +78,9 @@ under the License.
         <field name="infoString" title="${uiLabelMap.PartyContactInformation}">
             <text size="15"/>
         </field>
-        <field name="partyClassificationGroupId" title=" " use-when="parentTypeId == null">
-            <drop-down allow-multiple="true" size="20" allow-empty="true">
-                <entity-options entity-name="PartyClassificationGroupAndType">
+        <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroup}" use-when="parentTypeId == null">
+            <drop-down allow-multiple="true" size="5" allow-empty="false">
+                <entity-options entity-name="PartyClassificationGroupAndType" key-field-name="partyClassificationTypeId">
                     <entity-order-by field-name="partyClassificationTypeId"/>
                 </entity-options>
             </drop-down>
@@ -99,6 +99,7 @@ under the License.
             <sort-field name="groupName"/>
             <sort-field name="roleTypeId"/>
             <sort-field name="partyTypeId"/>
+            <sort-field name="partyClassificationGroupId"/>
             <field-group title="${uiLabelMap.PartyPartyIdentification}" initially-collapsed="true">
                 <sort-field name="idValue"/>
                 <sort-field name="partyIdentificationTypeId"/>