You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/06/30 22:13:35 UTC
svn commit: r1355802 - in /ofbiz/branches/release12.04: ./
applications/party/widget/partymgr/PartyForms.xml
Author: jleroux
Date: Sat Jun 30 20:13:35 2012
New Revision: 1355802
URL: http://svn.apache.org/viewvc?rev=1355802&view=rev
Log:
"Applied fix from trunk for revision: 1355801 "
------------------------------------------------------------------------
r1355801 | jleroux | 2012-06-30 22:12:19 +0200 (sam., 30 juin 2012) | 14 lines
A patch from Tom Burns for "Defects in Presentation of Role Type" https://issues.apache.org/jira/browse/OFBIZ-4947
Release 10.4 and SVN tunk
In Party Manager go to Profile > Roles(s)
1. Create a New Role Type
2. Click save
Expected: Screen refresh and return to Roles(s) tab on ProfileTabBar
Actual: Screen refresh ProfileTabBar missing
In SVN tunk
In Party Manager go to Profile > Roles(s)
Expected: Roles listed in screenlet Add To Main Role > Role Type Id drop-down list
Actual: Screenlet Add To Main Role > Role Type Id drop-down list is empty.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1355801
Modified: ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml?rev=1355802&r1=1355801&r2=1355802&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml Sat Jun 30 20:13:35 2012
@@ -1015,11 +1015,16 @@ under the License.
<field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
</form>
<form name="AddPartyMainRole" type="single" title="${uiLabelMap.PartyAddToMainRole}" target="addrole/viewroles">
+ <actions>
+ <entity-condition entity-name="RoleType" list="parentRoleList">
+ <condition-expr field-name="parentTypeId" operator="equals" from-field="nullField"/>
+ <order-by field-name="description"/>
+ </entity-condition>
+ </actions>
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', jQuery('#AddPartyMainRole').serialize());" entry-name="dummy">
<drop-down allow-empty="false">
<entity-options entity-name="RoleType" description="${description}">
- <entity-constraint name="parentTypeId" value=""/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -1039,6 +1044,7 @@ under the License.
<field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
</form>
<form name="AddRoleType" type="single" title="Add a new roletype" target="createroletype" list-name="parentRoleList">
+ <field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" required-field="true" entry-name="dummy" position="1"><text/></field>
<field name="parentTypeId" position="2">
<drop-down allow-empty="true">