svn commit: r1792274 - in /ofbiz/branches/release16.11: ./ applications/order/webapp/ordermgr/WEB-INF/controller.xml applications/order/widget/ordermgr/QuoteForms.xml

[Deepak Dixit-5]

Author: deepak
Date: Sat Apr 22 08:43:15 2017
New Revision: 1792274

URL: http://svn.apache.org/viewvc?rev=1792274&view=rev
Log:
Applied fix from trunk for revision: 1792272
===

Improved: From Date and Thru Date doesn't reflect on List Quote Roles screen.Applied slightly different patch from jira issue (OFBIZ-8266)
Thanks Akshay Modak for your contribution.

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 22 08:43:15 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1792274&r1=1792273&r2=1792274&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Apr 22 08:43:15 2017
@@ -1465,9 +1465,17 @@ under the License.
         </response>
         <response name="error" type="view" value="EditQuoteRole"/>
     </request-map>
+    <request-map uri="updateQuoteRole">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateQuoteRole"/>
+        <response name="success" type="request-redirect" value="ListQuoteRoles">
+            <redirect-parameter name="quoteId"/>
+        </response>
+        <response name="error" type="view" value="EditQuoteRole"/>
+    </request-map>
     <request-map uri="removeQuoteRole">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeQuoteRole"/>
+        <event type="service" invoke="removeQuoteRole"/>
         <response name="success" type="view" value="ListQuoteRoles"/>
         <response name="error" type="view" value="ListQuoteRoles"/>
     </request-map>

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml?rev=1792274&r1=1792273&r2=1792274&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml Sat Apr 22 08:43:15 2017
@@ -158,12 +158,14 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListQuoteRoles" target="" title="" type="list" list-name="quoteRoles"
+    <form name="ListQuoteRoles" target="updateQuoteRole" title="" type="list" list-name="quoteRoles"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteRoles">
         <auto-fields-entity entity-name="QuoteRole" default-field-type="display"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"></field>
-        <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity also-hidden="false" entity-name="RoleType"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity entity-name="RoleType"/></field>
+        <field name="thruDate" red-when="before-now"><date-time/></field>
         <field name="quoteId"><hidden/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteRole" also-hidden="false">
                 <parameter param-name="partyId"/>