svn commit: r1677769 - in /ofbiz/trunk/specialpurpose/ecommerce/widget: CustRequestScreens.xml QuoteScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1677769 - in /ofbiz/trunk/specialpurpose/ecommerce/widget: CustRequestScreens.xml QuoteScreens.xml

Deepak Dixit-5
Author: deepak
Date: Tue May  5 10:17:12 2015
New Revision: 1677769

URL: http://svn.apache.org/r1677769
Log:
Applied patch manually from jira issue OFBIZ-6207 - Anyone can view any Request or Quote

Thanks  Forrest Rae for reporting the issue and providing the patch.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml?rev=1677769&r1=1677768&r2=1677769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml Tue May  5 10:17:12 2015
@@ -81,6 +81,11 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonRequestDecorator">
                     <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-compare-field operator="equals" field="custRequest.fromPartyId" to-field="userLogin.partyId"></if-compare-field>
+                            </condition>
+                            <widgets>
                         <container style="lefthalf">
                             <platform-specific>
                                 <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestInfo.ftl"/></html>
@@ -100,6 +105,11 @@ under the License.
                                 <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestRoles.ftl"/></html>
                             </platform-specific>
                         </container>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.OrderNoRequestFound}</label>
+                            </fail-widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml?rev=1677769&r1=1677768&r2=1677769&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml Tue May  5 10:17:12 2015
@@ -70,10 +70,20 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-compare-field operator="equals" field="quote.partyId" to-field="userLogin.partyId"></if-compare-field>
+                            </condition>
+                            <widgets>
                         <platform-specific>
                             <html><html-template location="component://ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl"/></html>
                         </platform-specific>
                         <include-screen name="ViewQuoteTemplate" location="component://order/widget/ordermgr/QuoteScreens.xml"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.OrderNoQuoteFound}</label>
+                            </fail-widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>