Author: jleroux
Date: Sun Sep 15 09:41:28 2013
New Revision: 1523423
URL: http://svn.apache.org/r1523423
Log:
"Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
This fixes most of the issues but some are remaining, I report them in
OFBIZ-5320
Added:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml (with
props)
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
(with props)
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml (with
props)
Removed:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER.xml
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml
Modified:
ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml
ofbiz/trunk/applications/order/data/OrderHelpData.xml
ofbiz/trunk/applications/product/data/ProductHelpData.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sun Sep 15
09:41:28 2013
@@ -45,8 +45,8 @@ under the License.
<set field="layoutSettings.middleTopLink2"
value="${lastSystemInfoNote2.moreInfoUrl}${groovy: if
(lastSystemInfoNote2&&lastSystemInfoNote2.moreInfoItemName&&lastSystemInfoNote2.moreInfoItemId)"?"
+ lastSystemInfoNote2.moreInfoItemName + "=" +
lastSystemInfoNote2.moreInfoItemId + "&id=" +
lastSystemInfoNote2.moreInfoItemId;}"/>
<set field="layoutSettings.middleTopLink3"
value="${lastSystemInfoNote3.moreInfoUrl}${groovy: if
(lastSystemInfoNote3&&lastSystemInfoNote3.moreInfoItemName&&lastSystemInfoNote3.moreInfoItemId)"?"
+ lastSystemInfoNote3.moreInfoItemName + "=" +
lastSystemInfoNote3.moreInfoItemId + "&id=" +
lastSystemInfoNote3.moreInfoItemId;}"/>
<!-- Help link actions -->
- <!--<set field="helpTopic" value="${groovy: webSiteId + '_' +
requestAttributes._CURRENT_VIEW_}"/>-->
- <set field="helpTopic" value="${groovy:
parameters.componentName.toUpperCase() + '_' +
requestAttributes._CURRENT_VIEW_}"/>
+ <set field="helpTopic" value="${groovy:
webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/>
+<!-- <set field="dummy" value="${groovy:
System.out.println('helpTopic===============' + context.helpTopic)}"/>-->
<entity-and list="pageAvail" entity-name="ContentAssoc">
<field-map field-name="mapKey" from-field="helpTopic"/>
</entity-and>
Modified: ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml Sun Sep 15
09:41:28 2013
@@ -34,6 +34,6 @@ under the License.
<DataResource dataResourceId="HR_training" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/humanres/data/helpdata/HELP_HR_training.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human
Resources Training Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HR_training" contentTypeId="DOCUMENT"
contentName="Training." templateDataResourceId="HELP_TEMPL"
dataResourceId="HR_training" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training"
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01"
sequenceNum="000" mapKey="HUMANRES_training"/>
+ <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training"
contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01"
sequenceNum="000" mapKey="HUMANRES_TrainingCalendar"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/order/data/OrderHelpData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderHelpData.xml?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderHelpData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderHelpData.xml Sun Sep 15 09:41:28
2013
@@ -18,22 +18,22 @@ specific language governing permissions
under the License.
-->
<entity-engine-xml>
- <DataResource dataResourceId="HELP_ORDER" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
- objectInfo="applications/order/data/helpdata/HELP_ORDER.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+ <DataResource dataResourceId="HELP_ORDERMGR" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/order/data/helpdata/HELP_ORDERMGR.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Order" mimeTypeId="text/xml" isPublic="Y" />
- <Content contentId="HELP_ORDER" contentTypeId="DOCUMENT"
contentName="Order Manager" templateDataResourceId="HELP_TEMPL"
- dataResourceId="HELP_ORDER" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ORDER"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000"/>
+ <Content contentId="HELP_ORDERMGR" contentTypeId="DOCUMENT"
contentName="Order Manager" templateDataResourceId="HELP_TEMPL"
+ dataResourceId="HELP_ORDERMGR" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ORDERMGR"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000"/>
<!-- Order View -->
- <DataResource dataResourceId="HELP_ORDER_VIEW" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
- objectInfo="applications/order/data/helpdata/HELP_ORDER_View.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
- <Content contentId="HELP_ORDER_VIEW" contentTypeId="DOCUMENT"
contentName="Order View Help" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ORDER_VIEW" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_VIEW"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000" mapKey="ORDER_overview"/>
+ <DataResource dataResourceId="HELP_ORDERMGR_VIEW" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/order/data/helpdata/HELP_ORDERMGR_View.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_ORDERMGR_VIEW" contentTypeId="DOCUMENT"
contentName="Order View Help" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ORDERMGR_VIEW" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ORDERMGR" contentIdTo="HELP_ORDERMGR_VIEW"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000" mapKey="ORDERMGR_orderview"/>
<!-- Reports -->
- <DataResource dataResourceId="HELP_ORDER_REPORT" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
- objectInfo="applications/order/data/helpdata/HELP_ORDER_Report.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
- <Content contentId="HELP_ORDER_REPORT" contentTypeId="DOCUMENT"
contentName="Order Reports Help" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ORDER_REPORT" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_REPORT"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000" mapKey="ORDER_OrderPurchaseReportOptions"/>
+ <DataResource dataResourceId="HELP_ORDERMGR_REPORT" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/order/data/helpdata/HELP_ORDERMGR_Report.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_ORDERMGR_REPORT" contentTypeId="DOCUMENT"
contentName="Order Reports Help" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ORDERMGR_REPORT" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ORDERMGR" contentIdTo="HELP_ORDERMGR_REPORT"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000" mapKey="ORDERMGR_OrderPurchaseReportOptions"/>
</entity-engine-xml>
Added: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml?rev=1523423&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml (added)
+++ ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml Sun Sep 15
09:41:28 2013
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
+ xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>Order Introduction</title>
+ <para>
+ The order manager allows you to enter and maintain orders, quotes,
requests and report on them.
+ </para>
+</section>
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml?rev=1523423&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
(added)
+++ ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml Sun
Sep 15 09:41:28 2013
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
+ xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>Order Reports Help.</title>
+ <para>
+ The Order Reports provide general information about orders in the
system.
+ </para>
+ <section>
+ <title>
+ Initial steps.
+ </title>
+ <section>
+ <para>
+ If your reports look empty it may be required to
initialize the warehouse entities in the BI component.
+ </para>
+ <orderedlist>
+ <listitem>
+ <para>Go to :<link
xl:href="https://localhost:8443/bi/control/main";>Business
Intelligence</link></para>
+ </listitem>
+ <listitem>
+ <para>Click "Quick Init DataWarehouse". System will
automatic initial Data in the warehouse for Reports</para>
+ </listitem>
+ <listitem>
+ <para>Go back to : <link
xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions";>Order
Reports.</link></para>
+ </listitem>
+ </orderedlist>
+ </section>
+ </section>
+ <section>
+ <title>Reports List</title>
+ <section>
+ <title>1. Sales Order By Referrer Report</title>
+ <para>
+ There are referrers, link, totals orders, quantity totals
and amount totals. They are grouped by referrer.
+ </para>
+ </section>
+ <section>
+ <title>2. Sales Order By Channel Report</title>
+ <para>
+ There are total Orders, total Items, quantity totals and
amount totals. They are grouped by Sales Channel.
+ </para>
+ </section>
+ <section>
+ <title>3. Sale Orders Discount Code Report</title>
+ <para>
+ There are order, product, promotion and discount. This report
is list of All orders.
+ </para>
+ </section>
+ <section>
+ <title>4. Last Three Months Sales Report</title>
+ <para>
+ There are products, prices, stock, sale out quantity and sale
out total amount.
+ This report is list of all products, it contains the sales and
movements in last 3 months.
+ </para>
+ </section>
+ <section>
+ <title>5. Coupon Sales Report</title>
+ <para>
+ This report lists promotions, total orders, percent of total
orders, total orders amount, percent of total orders amount and shipping
amounts.
+ </para>
+ </section>
+ <section>
+ <title>6. Sales Report</title>
+ <para>
+ This Sales report contains paid and unpaid sales orders.
+ </para>
+ </section>
+ <section>
+ <title>7. Net Before Overhead Report</title>
+ <para>
+ Net Before Overhead Report is the profit calculation of
paid-shipped orders and all the occurred fee excluding the overhead cost.
+ They are grouped by Product Store Id.(Demo data for Net Before
Overhead Report have in Product Store Id "B2CStore")
+ </para>
+ </section>
+ <section>
+ <title>8. Product Demand Report</title>
+ <para>
+ Product Demand Report is the report to show us which product
sells good and which product doesnât sell good or not selling at all in one
account as well as for all accounts in last 4 weeks.
+ They are grouped by Product Store Id.(Demo data for Product
Demand Report have in Product Store Id "B2CStore")
+ </para>
+ </section>
+ </section>
+</section>
Propchange:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_Report.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml?rev=1523423&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml (added)
+++ ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml Sun Sep
15 09:41:28 2013
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="5.0"
xmlns:xl="http://www.w3.org/1999/xlink";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>Order View</title>
+ <para> This screen allow not only to view an order but also to change it
(this is a mock to hide a weird bug, please fill in...)</para>
+</section>
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDERMGR_View.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/product/data/ProductHelpData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductHelpData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Sun Sep 15
09:41:28 2013
@@ -29,7 +29,7 @@ under the License.
<!-- Image Management -->
<DataResource dataResourceId="IMAGEMANAGEMENT_MAIN" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Image
Management" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="IMAGEMANAGEMENT_MAIN" contentTypeId="DOCUMENT"
contentName="Image Management" templateDataResourceId="HELP_TEMPL"
dataResourceId="IMAGEMANAGEMENT_MAIN" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
- <ContentAssoc contentId="PRODCATALOG_main"
contentIdTo="IMAGEMANAGEMENT_MAIN" contentAssocTypeId="TREE_CHILD"
fromDate="2006-01-12 01:01:01" sequenceNum="01"
mapKey="PRODUCT_Imagemanagement"/>
+ <ContentAssoc contentId="PRODCATALOG_main"
contentIdTo="IMAGEMANAGEMENT_MAIN" contentAssocTypeId="TREE_CHILD"
fromDate="2006-01-12 01:01:01" sequenceNum="01"
mapKey="CATALOG_Imagemanagement"/>
<!-- Facility help pages -->
<DataResource dataResourceId="HELP_FACILITY" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sun Sep 15 09:41:28
2013
@@ -37,7 +37,9 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="webtools" global="true"/>
<!-- <set field="appheaderTemplate"
value="component://webtools/webapp/webtools/includes/appheader.ftl"
global="true"/> -->
-
+ <!-- Help link actions -->
+ <set field="helpTopic" value="${groovy:
webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/>
+<!-- <set field="dummy" value="${groovy:
System.out.println('helpTopic===============' + context.helpTopic)}"/>-->
<set field="applicationMenuLocation"
value="component://webtools/widget/Menus.xml" global="true"/>
<set field="applicationMenuName" value="WebtoolsAppBar"
global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.FrameworkWebTools}" global="true"/>
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1523423&r1=1523422&r2=1523423&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
Sun Sep 15 09:41:28 2013
@@ -217,6 +217,9 @@ public class ScreenRenderer {
context.put("response", response);
context.put("session", session);
context.put("application", servletContext);
+ if (session != null) {
+ context.put("webappName", session.getAttribute("_WEBAPP_NAME_"));
+ }
if (servletContext != null) {
String rootDir = (String) context.get("rootDir");
String webSiteId = (String) context.get("webSiteId");
