svn commit: r993381 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: erwan
Date: Tue Sep 7 14:34:00 2010 New Revision: 993381 URL: http://svn.apache.org/viewvc?rev=993381&view=rev Log: OFBIZ-3854 Separate AddPartyRole form to main and second role -- a patch from Nicolas Malin Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=993381&r1=993380&r2=993381&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Sep 7 14:34:00 2010 @@ -2636,6 +2636,18 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸ªà¸à¸²à¸à¸°</value> <value xml:lang="zh">æ·»å è§è²</value> </property> + <property key="PartyAddToMainRole"> + <value xml:lang="en">Add To Main Role</value> + <value xml:lang="fr">Ajouter le rôle principal</value> + </property> + <property key="PartyAddToSecondRole"> + <value xml:lang="en">Add To Second Role</value> + <value xml:lang="fr">Ajouter le rôle secondaire</value> + </property> + <property key="PartyAddToRoleViewAll"> + <value xml:lang="en">Add To Role : view all</value> + <value xml:lang="fr">Ajouter le rôle : vue générale</value> + </property> <property key="PartyAddToRole"> <value xml:lang="de">Zur Rolle hinzufügen</value> <value xml:lang="en">Add To Role</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=993381&r1=993380&r2=993381&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue Sep 7 14:34:00 2010 @@ -640,6 +640,7 @@ under the License. <response name="error" type="view" value="ViewSegmentRoles"/> </request-map> + <request-map uri="addsecondaryroles"><security https="true" auth="true"/><response name="success" type="view" value="addsecondaryroles"/></request-map> <request-map uri="addrole"> <security https="true" auth="true"/> <event type="service" path="" invoke="createPartyRole"/> @@ -1300,6 +1301,7 @@ under the License. <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/> <view-map name="partyContentList" type="screen" page="component://party/widget/partymgr/ProfileScreens.xml#ContentList"/> <view-map name="viewroles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewroles"/> + <view-map name="addsecondaryroles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#AddPartySecondaryRoles"/> <view-map name="viewidentifications" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#ListPartyIdentifications"/> <view-map name="linkparty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#linkparty"/> <view-map name="EditPartyRelationships" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyRelationships"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=993381&r1=993380&r2=993381&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Tue Sep 7 14:34:00 2010 @@ -983,6 +983,30 @@ under the License. </field> <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> + <form name="AddPartyMainRole" type="single" title="${uiLabelMap.PartyAddToMainRole}" target="addrole/viewroles"> + <field name="partyId"><hidden value="${parameters.partyId}"/></field> + <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', $('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> + </field> + <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> + </form> + <form name="AddPartySecondaryRoles" type="single" title="${uiLabelMap.PartyAddToSecondRole}" target="addrole/viewroles"> + <field name="partyId"><hidden value="${parameters.partyId}"/></field> + <field name="roleTypeId" entry-name="dummy"> + <drop-down allow-empty="false"> + <entity-options entity-name="RoleType" description="${description}"> + <entity-constraint name="parentTypeId" value="${parameters.roleTypeId}"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <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="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" required-field="true" entry-name="dummy" position="1"><text/></field> <field name="parentTypeId" position="2"> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=993381&r1=993380&r2=993381&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Sep 7 14:34:00 2010 @@ -175,6 +175,12 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PartyAddToRole}"> + <container> + <label style="h2">${uiLabelMap.PartyAddToMainRole}</label> + <include-form name="AddPartyMainRole" location="component://party/widget/partymgr/PartyForms.xml"/> + <container id="addPartySecondaryRole"/> + </container> + <label style="h2">${uiLabelMap.PartyAddToRoleViewAll}</label> <include-form name="AddPartyRole" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> @@ -200,6 +206,18 @@ under the License. </widgets> </section> </screen> + <screen name="AddPartySecondaryRoles"> + <section> + <actions> + <property-map map-name="uiLabelMap" resource="CommonUiLabels"/> + <property-map map-name="uiLabelMap" resource="PartyUiLabels"/> + </actions> + <widgets> + <label style="h2">${uiLabelMap.PartyAddToSecondRole}</label> + <include-form name="AddPartySecondaryRoles" location="component://party/widget/partymgr/PartyForms.xml"/> + </widgets> + </section> + </screen> <screen name="linkparty"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |