svn commit: r934744 - /ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml

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

svn commit: r934744 - /ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml

jleroux@apache.org
Author: jleroux
Date: Fri Apr 16 11:07:31 2010
New Revision: 934744

URL: http://svn.apache.org/viewvc?rev=934744&view=rev
Log:
A patch from Chris Snow "ecommerce screen shows error after loading only seed data" (https://issues.apache.org/jira/browse/OFBIZ-2798) - OFBIZ-2798

A slight different patch (not same message) will be applied later

Modified:
    ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=934744&r1=934743&r2=934744&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Apr 16 11:07:31 2010
@@ -60,25 +60,35 @@ under the License.
                 <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/footer.ftl"/>
             </actions>
             <widgets>
-                <!-- render header -->
-                <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific>
-
-                <container id="ecom-mainarea">
-                    <!-- by default will render left-bar only if left/rightbarScreenName value not empty -->
-                    <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
-                    <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/>
-
-                    <container style="${MainColumnStyle}">
-                        <!-- render messages -->
-                        <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
-                        <decorator-section-include name="body"/>
-                    </container>
-
-                    <container style="endcolumns"/>
-                </container>
-
-                <!-- render footer -->
-                <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific>
+               <section>
+                  <condition>
+                     <not><if-empty field="globalContext.productStore"/></not>
+                  </condition>
+                  <widgets>
+                      <!-- render header -->
+                      <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific>
+
+                   <container id="ecom-mainarea">
+                          <!-- by default will render left-bar only if left/rightbarScreenName value not empty-->
+                          <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
+                          <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/>
+
+                          <container style="${MainColumnStyle}">
+                              <!-- render messages -->
+                              <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+                              <decorator-section-include name="body"/>
+                          </container>
+
+                          <container style="endcolumns"/>
+                      </container>
+
+                      <!-- render footer -->
+                      <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific>
+                  </widgets>
+                  <fail-widgets>
+                     <label text="A Product Store has not been defined for this ecommerce site.  A Product Store can be defined using the Catalog component."/>
+                  </fail-widgets>
+            </section>
             </widgets>
         </section>
     </screen>