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

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Jul  8 18:34:08 2017
New Revision: 1801308

URL: http://svn.apache.org/viewvc?rev=1801308&view=rev
Log:
Fixed: Create New button is misplaced on Party Content Screen.(OFBIZ-9328)
Thanks Devanshu and Humera for your contribution.

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

Modified: ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1801308&r1=1801307&r2=1801308&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jul  8 18:34:08 2017
@@ -935,6 +935,10 @@ under the License.
     </request-map>
 
     <!-- Create and Upload Party Content -->
+    <request-map uri="CreatePartyContent">
+        <security auth="true" https="true"/>
+        <response name="success" type="view" value="CreatePartyContent"/>
+    </request-map>
     <request-map uri="EditPartyContents">
         <security auth="true" https="true"/>
         <response name="success" type="view" value="EditPartyContents"/>
@@ -943,19 +947,25 @@ under the License.
     <request-map uri="createPartyContent">
         <security auth="true" https="true"/>
         <event type="simple" path="component://party/minilang/party/PartySimpleEvents.xml" invoke="createPartyContent"/>
-        <response name="success" type="view" value="EditPartyContents"/>
+        <response name="success" type="request-redirect" value="EditPartyContents">
+            <redirect-parameter name="partyId"></redirect-parameter>
+        </response>
     </request-map>
 
     <request-map uri="updatePartyContent">
         <security auth="true" https="true"/>
         <event type="simple" path="component://party/minilang/party/PartySimpleEvents.xml" invoke="updatePartyContent"/>
-        <response name="success" type="view" value="EditPartyContents"/>
+        <response name="success" type="request-redirect" value="EditPartyContents">
+            <redirect-parameter name="partyId"></redirect-parameter>
+        </response>
     </request-map>
 
     <request-map uri="removePartyContent">
         <security auth="true" https="true"/>
         <event type="service" invoke="removePartyContent"/>
-        <response name="success" type="view" value="EditPartyContents"/>
+        <response name="success" type="request-redirect" value="EditPartyContents">
+            <redirect-parameter name="partyId"></redirect-parameter>
+        </response>
     </request-map>
 
     <request-map uri="uploadPartyContent">
@@ -1387,6 +1397,7 @@ under the License.
     <view-map name="PartyExportCsv" type="screencsv" page="component://party/widget/partymgr/PartyScreens.xml#PartyExportCsv" content-type="text/csv" encoding="none"/>
 
     <view-map name="EditPartyContents" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyContents"/>
+    <view-map name="CreatePartyContent" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreatePartyContent"/>
     <view-map name="editCarrierAccount" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#editCarrierAccount"/>
     <view-map name="partyInvitation" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#FindPartyInvitations"/>
     <view-map name="editPartyInvitation" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitation"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1801308&r1=1801307&r2=1801308&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Jul  8 18:34:08 2017
@@ -869,17 +869,41 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonPartyDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
+                        <container style="button-bar">
+                            <link target="CreatePartyContent" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+                                <parameter param-name="partyId"/>
+                            </link>
+                        </container>
                         <screenlet title="${uiLabelMap.PageTitleListContent}">
-                            <container>
-                                <link target="EditPartyContents" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
-                                    <parameter param-name="partyId"/>
-                                </link>
-                            </container>
                             <include-form name="ListPartyContents" location="component://party/widget/partymgr/PartyForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleAddPartyContent}">
                             <include-form name="AddPartyContent" location="component://party/widget/partymgr/PartyForms.xml"/>
                         </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="CreatePartyContent">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListContent"/>
+                <set field="headerItem" value="find"/>
+                <set field="tabButtonItem" value="PartyContents"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyDecorator"  location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="button-bar">
+                            <link target="CreatePartyContent" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+                                <parameter param-name="partyId"/>
+                            </link>
+                        </container>
+                        <screenlet title="${uiLabelMap.PageTitleAddPartyContent}">
+                            <include-form name="AddPartyContent" location="component://party/widget/partymgr/PartyForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>