svn commit: r992785 - in /ofbiz/trunk/framework/webtools: webapp/webtools/performance/ widget/EntityForms.xml widget/EntityScreens.xml

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

svn commit: r992785 - in /ofbiz/trunk/framework/webtools: webapp/webtools/performance/ widget/EntityForms.xml widget/EntityScreens.xml

buscob
Author: buscob
Date: Sun Sep  5 13:54:46 2010
New Revision: 992785

URL: http://svn.apache.org/viewvc?rev=992785&view=rev
Log:
Converted WebTools->Entity performance test screens from FTL to form widgets

Removed:
    ofbiz/trunk/framework/webtools/webapp/webtools/performance/
Modified:
    ofbiz/trunk/framework/webtools/widget/EntityForms.xml
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml

Modified: ofbiz/trunk/framework/webtools/widget/EntityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityForms.xml?rev=992785&r1=992784&r2=992785&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityForms.xml Sun Sep  5 13:54:46 2010
@@ -33,4 +33,13 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
+
+    <form name="ListPerformanceResults" type="list" list-name="performanceList" paginate-target="EntityPerformanceTest" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="operation" title="${uiLabelMap.WebtoolsPerformanceOperation}"><display/></field>
+        <field name="entity" title="${uiLabelMap.WebtoolsEntity}"><display/></field>
+        <field name="calls" title="${uiLabelMap.WebtoolsPerformanceCalls}"><display/></field>
+        <field name="seconds" title="${uiLabelMap.WebtoolsPerformanceSeconds}"><display/></field>
+        <field name="secsPerCall" title="${uiLabelMap.WebtoolsPerformanceSecondsCall}"><display/></field>
+        <field name="callsPerSecond" title="${uiLabelMap.WebtoolsPerformanceCallsSecond}"><display/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=992785&r1=992784&r2=992785&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun Sep  5 13:54:46 2010
@@ -384,6 +384,9 @@ under the License.
     </screen>
     <screen name="EntityPerformanceTest">
         <section>
+            <condition>
+                <if-has-permission permission="ENTITY_MAINT"/>
+            </condition>
             <actions>
                 <set field="headerItem" value="main"/>
                 <set field="titleProperty" value="WebtoolsPerformanceTests"/>
@@ -392,12 +395,16 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://webtools/webapp/webtools/performance/EntityPerformanceTest.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.WebtoolsEntityEnginePerformanceTests}">
+                            <label>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</label>
+                            <include-form name="ListPerformanceResults" location="component://webtools/widget/EntityForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsPermissionMaint}</label>
+            </fail-widgets>
         </section>
     </screen>
     <screen name="xmldsdump">
@@ -440,5 +447,3 @@ under the License.
         </section>
     </screen>
 </screens>
-
-