svn commit: r688635 - in /ofbiz/trunk/applications/party: webapp/partymgr/WEB-INF/controller.xml webapp/partymgr/party/PartyForms.xml widget/partymgr/PartyScreens.xml

[hansbak-2]

Author: hansbak
Date: Sun Aug 24 23:46:05 2008
New Revision: 688635

URL: http://svn.apache.org/viewvc?rev=688635&view=rev
Log:
after create contact return to relationship edit screen

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

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=688635&r1=688634&r2=688635&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Aug 24 23:46:05 2008
@@ -637,12 +637,6 @@
         <response name="success" type="view" value="EditPartyRelationships"/>
         <response name="error" type="view" value="EditPartyRelationships"/>
     </request-map>
-    <request-map uri="createAccountContact">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createPartyRelationship"/>
-        <response name="success" type="view" value="viewprofile"/>
-        <response name="error" type="view" value="EditPartyRelationships"/>
-    </request-map>
     <request-map uri="updatePartyRelationship">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updatePartyRelationship"/>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=688635&r1=688634&r2=688635&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Aug 24 23:46:05 2008
@@ -748,7 +748,7 @@
         <field name="submitButton"><submit button-type="button"/></field>
     </form>
     
-    <form name="AddAccount" type="single" target="createAccountContact">
+    <form name="AddAccount" type="single" target="createPartyRelationship">
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>
         <field name="partyIdFrom"><lookup target-form-name="LookupAccount"/></field>
         <field name="roleTypeIdFrom"><hidden value="ACCOUNT"/></field>
@@ -758,7 +758,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     
-    <form name="AddContact" type="single" target="createAccountContact">
+    <form name="AddContact" type="single" target="createPartyRelationship">
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>
         <field name="partyIdFrom"><hidden value="${parameters.partyId}"/></field>
         <field name="roleTypeIdFrom"><hidden value="ACCOUNT"/></field>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=688635&r1=688634&r2=688635&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Aug 24 23:46:05 2008
@@ -212,7 +212,7 @@
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PartyRelationships}">
+                        <screenlet title="${uiLabelMap.PartyRelationships}" navigation-form-name="ListPartyRelationships">
                             <include-form name="ListPartyRelationships" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
                         </screenlet>
                         <container style="lefthalf">