Author: jleroux
Date: Sun Jul 15 08:57:57 2012
New Revision: 1361662
URL: http://svn.apache.org/viewvc?rev=1361662&view=rev
Log:
A (slightly modified) patch from Tom Burns for "Example Application Issues"
https://issues.apache.org/jira/browse/OFBIZ-4960
Problem path 1:
Find Example > Find Example
Select EX01
Click Items Tab (or Features)
Click Example Tab
Expected: Example Details form in the context of the Example menus
Actual: New Example Form under Example Application menus
Problem path 2:
Example > click New Example
Enter a new example
Expected: Example Details form to add Items and Features to the New Example
Actual: Example page filtered on newly created example
(this is a problem for a new user who will not know how to clear the Example Id
from the Search Options form. A better path would be to go to the edit forms
where the user can add additional information on the example i.e. Items and
Features)
Problem path 3:
Features > New Example Features
Enter a Description > Click Create
Enter a Type and Sequence Num
Click Add
Expected: Create a new Example Feature Appl
Actual: Error Problem 3: Error missing exampleFeatureId
jleroux: just put comments about checks Tom wanted to remove: <!-- This is a
check useful when only seed data are loaded -->
Modified:
ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml
ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureScreens.xml
ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
Modified: ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml Sun Jul 15
08:57:57 2012
@@ -428,6 +428,12 @@
<value xml:lang="th">ลัà¸à¸©à¸à¸°</value>
<value xml:lang="zh">ç¹å¾</value>
</property>
+ <property key="ExampleFeaturesAddToExample">
+ <value xml:lang="en">Add Feature To Example</value>
+ </property>
+ <property key="ExampleFeaturesByExample">
+ <value xml:lang="en">Features by Example</value>
+ </property>
<property key="ExampleField">
<value xml:lang="en">Field</value>
<value xml:lang="it">Campo</value>
Modified:
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
Sun Jul 15 08:57:57 2012
@@ -59,7 +59,7 @@ under the License.
<request-map uri="createExample">
<security https="true" auth="true"/>
<event type="service" invoke="createExample"/>
- <response name="success" type="request-redirect" value="FindExample">
+ <response name="success" type="request-redirect" value="EditExample">
<redirect-parameter name="exampleId"/>
</response>
<response name="error" type="view" value="FindExample"/>
@@ -152,7 +152,7 @@ under the License.
<security https="true" auth="true"/>
<event type="service" invoke="updateExampleFeature"/>
<response name="success" type="request-redirect"
value="EditExampleFeature">
- <redirect-parameter name="exampleId"/>
+ <redirect-parameter name="exampleFeatureId"/>
</response>
<response name="error" type="view" value="EditExampleFeature"/>
</request-map>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml Sun Jul
15 08:57:57 2012
@@ -70,7 +70,7 @@ under the License.
<condition>
<and>
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
- <not><if-empty field="example"/></not>
+ <not><if-empty field="example"/></not><!--
This is a check useful when only seed data are loaded -->
</and>
</condition>
<widgets>
@@ -87,7 +87,7 @@ under the License.
<widgets>
<section>
<condition>
- <not><if-empty field="example"/></not>
+ <not><if-empty
field="example"/></not><!-- This is a check useful when only seed data are
loaded -->
</condition>
<widgets>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
@@ -139,7 +139,7 @@ under the License.
<condition>
<and>
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
- <not><if-empty
field="exampleFeature"/></not>
+ <not><if-empty
field="exampleFeature"/></not><!-- This is a check useful when only seed data
are loaded -->
</and>
</condition>
<widgets>
@@ -156,7 +156,7 @@ under the License.
<widgets>
<section>
<condition>
- <not><if-empty
field="exampleFeature"/></not>
+ <not><if-empty
field="exampleFeature"/></not><!-- This is a check useful when only seed data
are loaded -->
</condition>
<widgets>
<container style="h1">
Modified:
ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml
Sun Jul 15 08:57:57 2012
@@ -75,7 +75,7 @@ under the License.
<form name="ListExampleFeatureAppls" type="list"
list-name="exampleFeatureAppls" target="feature_updateExampleFeatureAppl">
<actions>
<entity-condition entity-name="ExampleFeatureAppl">
- <condition-expr field-name="exampleFeatureId"
from-field="exampleFeatureId"/>
+ <order-by field-name="exampleId"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
</actions>
@@ -106,6 +106,7 @@ under the License.
</field>
</form>
+
<form name="AddExampleFeatureAppl" type="single"
target="feature_createExampleFeatureAppl" title="">
<auto-fields-service service-name="createExampleFeatureAppl"/>
<field name="exampleId" title="${uiLabelMap.ExampleExample}">
@@ -115,7 +116,13 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="exampleFeatureId"><hidden/></field>
+ <field name="exampleFeatureId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="ExampleFeature"
description="${description} [${exampleFeatureId}]">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="exampleFeatureApplTypeId"
title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
<entity-options entity-name="ExampleFeatureApplType"
description="${description}">
Modified:
ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureScreens.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureScreens.xml
Sun Jul 15 08:57:57 2012
@@ -70,7 +70,9 @@ under the License.
<widgets>
<decorator-screen name="CommonExampleFeatureDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditExampleFeature"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ <screenlet title="${uiLabelMap.ExampleFeature}">
+ <include-form name="EditExampleFeature"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -87,8 +89,12 @@ under the License.
<widgets>
<decorator-screen name="CommonExampleFeatureDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListExampleFeatureAppls"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
- <include-form name="AddExampleFeatureAppl"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ <screenlet
title="${uiLabelMap.ExampleFeaturesByExample}">
+ <include-form name="ListExampleFeatureAppls"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
+ <screenlet title="Add Feature To Example">
+ <include-form name="AddExampleFeatureAppl"
location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml Sun Jul
15 08:57:57 2012
@@ -46,7 +46,9 @@ under the License.
<menu name="EditExample" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="EditExample" title="${uiLabelMap.ExampleExample}">
- <link target="EditExample"/>
+ <link target="EditExample">
+ <parameter param-name="exampleId"/>
+ </link>
</menu-item>
<menu-item name="EditExampleItems" title="${uiLabelMap.CommonItems}">
<link target="EditExampleItems">
Modified: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml?rev=1361662&r1=1361661&r2=1361662&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml Sun
Jul 15 08:57:57 2012
@@ -46,7 +46,7 @@ under the License.
<condition>
<and>
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
- <not><if-empty field="example"/></not>
+ <not><if-empty field="example"/></not><!--
This is an example of check useful when only seed data are loaded -->
</and>
</condition>
<widgets>
@@ -63,7 +63,7 @@ under the License.
<widgets>
<section>
<condition>
- <not><if-empty field="example"/></not>
+ <not><if-empty
field="example"/></not><!-- This is a check useful when only seed data are
loaded -->
</condition>
<widgets>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
