Author: mor
Date: Wed Jun 2 18:57:20 2010
New Revision: 950719
URL: http://svn.apache.org/viewvc?rev=950719&view=rev
Log:
Fixed an issue with menu item not coming as selected upon selection. Also moved
redundant declaration of the headerItem variable in independent
screens to just the screen decorator.
Modified:
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=950719&r1=950718&r2=950719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Wed Jun 2
18:57:20 2010
@@ -456,12 +456,12 @@ under the License.
</menu-item>
</menu>
- <menu name="WebAnalyticsConfigTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu name="WebAnalyticsConfigTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="FindWebAnalyticsConfigs"
title="${uiLabelMap.CommonFind}"><link
target="FindWebAnalyticsConfigs"/></menu-item>
<menu-item name="EditWebAnalyticsConfig"
title="${uiLabelMap.CommonNew}"><link
target="EditWebAnalyticsConfig"/></menu-item>
</menu>
- <menu name="WebAnalyticsTypeTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu name="WebAnalyticsTypeTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="FindWebAnalyticsTypes"
title="${uiLabelMap.CommonFind}"><link
target="FindWebAnalyticsTypes"/></menu-item>
<menu-item name="EditWebAnalyticsType"
title="${uiLabelMap.CommonNew}"><link
target="EditWebAnalyticsType"/></menu-item>
</menu>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=950719&r1=950718&r2=950719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Jun
2 18:57:20 2010
@@ -309,6 +309,7 @@ under the License.
<screen name="CommonWebAnalyticsDecorator">
<section>
<actions>
+ <set field="headerItem" value="WebAnalytics"/>
<set field="leftbarScreenName" value="leftbar"/>
<set field="leftbarScreenLocation"
value="component://product/widget/catalog/CommonScreens.xml"/>
<set field="MainColumnStyle" value="leftonly"/>
Modified:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml?rev=950719&r1=950718&r2=950719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml Wed
Jun 2 18:57:20 2010
@@ -24,9 +24,8 @@ under the License.
<section>
<actions>
<set field="titleProperty"
value="PageTitleFindWebAnalyticsConfigs"/>
- <set field="headerItem" value="WebAnalytics"/>
<set field="tabButtonItem" value="WebAnalyticsConfigs"/>
- <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="tabButtonItem2" value="FindWebAnalyticsConfigs"/>
<set field="webAnalyticsConfigCtx" from-field="parameters"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="10"/>
@@ -57,9 +56,8 @@ under the License.
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditWebAnalyticsConfigs"/>
- <set field="headerItem" value="WebAnalytics"/>
<set field="tabButtonItem" value="WebAnalyticsConfigs"/>
- <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="tabButtonItem2" value="EditWebAnalyticsConfig"/>
<set field="productStoreId"
from-field="parameters.productStoreId"/>
<set field="webAnalyticsTypeId"
from-field="parameters.webAnalyticsTypeId"/>
<entity-one entity-name="WebAnalyticsConfig"
value-field="webAnalyticsConfig" auto-field-map="true"/>
@@ -81,7 +79,6 @@ under the License.
<section>
<actions>
<set field="titleProperty"
value="PageTitleFindWebAnalyticsTypes"/>
- <set field="headerItem" value="WebAnalytics"/>
<set field="tabButtonItem" value="WebAnalyticsTypes"/>
<set field="tabButtonItem2" value="FindWebAnalyticsTypes"/>
<set field="webAnalyticsTypeCtx" from-field="parameters"/>
@@ -114,9 +111,8 @@ under the License.
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditWebAnalyticsTypes"/>
- <set field="headerItem" value="WebAnalytics"/>
<set field="tabButtonItem" value="WebAnalyticsTypes"/>
- <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="tabButtonItem2" value="EditWebAnalyticsType"/>
<set field="webAnalyticsTypeId"
from-field="parameters.webAnalyticsTypeId"/>
<entity-one entity-name="WebAnalyticsType"
value-field="webAnalyticsType" auto-field-map="true"/>
</actions>
