OFBiz › OFBiz - Commits

svn commit: r813311 - in /ofbiz/trunk: applications/accounting/data/ applications/commonext/webapp/WEB-INF/ applications/commonext/widget/ applications/content/data/ applications/content/data/helpdata/ applications/marketing/data/ applications/product/...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
hansbak-2
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r813311 - in /ofbiz/trunk: applications/accounting/data/ applications/commonext/webapp/WEB-INF/ applications/commonext/widget/ applications/content/data/ applications/content/data/helpdata/ applications/marketing/data/ applications/product/...

hansbak-2
Author: hansbak
Date: Thu Sep 10 08:49:30 2009
New Revision: 813311

URL: http://svn.apache.org/viewvc?rev=813311&view=rev
Log:
help system now using the mapKey in ContentAssoc so its size is now limited to 100 instead of 20. Suggestion made by Scott: thanks

Modified:
    ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
    ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
    ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
    ofbiz/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT.xml
    ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
    ofbiz/trunk/applications/product/data/ProductHelpData.xml
    ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl

Modified: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml Thu Sep 10 08:49:30 2009
@@ -28,35 +28,36 @@
     <DataResource dataResourceId="ACCOUNTING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Main Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_main" contentTypeId="DOCUMENT" contentName="Accounting Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_main"/>
 
 <DataResource dataResourceId="ACCOUNTING_findInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoi.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_findInvoi" contentTypeId="DOCUMENT" contentName="Accounting Find Invoices Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_findInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_findInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findInvoices"/>
+
 
 <DataResource dataResourceId="ACCOUNTING_invoiceOv" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOv.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Overview Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_invoiceOv" contentTypeId="DOCUMENT" contentName="Accounting Invoice Overview Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceOverview"/>
 
 <DataResource dataResourceId="ACCOUNTING_editInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoi.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_editInvoi" contentTypeId="DOCUMENT" contentName="Accounting Edit Invoice Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoice"/>
 
 <DataResource dataResourceId="ACCOUNTING_listInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoi.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_listInvoi" contentTypeId="DOCUMENT" contentName="Accounting List Invoices Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_listInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_listInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_listInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_listInvoices"/>
 
 <DataResource dataResourceId="ACCOUNTING_sendPerEm" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEm.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Send Per Email Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_sendPerEm" contentTypeId="DOCUMENT" contentName="Accounting Invoice Send Per Email Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_sendPerEm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_sendPerEm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_sendPerEm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_sendPerEmail"/>
 
 <DataResource dataResourceId="ACCOUNTING_invoiceRo" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRo.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Roles Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_invoiceRo" contentTypeId="DOCUMENT" contentName="Accounting Invoice Roles Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceRoles"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml Thu Sep 10 08:49:30 2009
@@ -23,6 +23,8 @@
     <description>General Application CommonExt Configuration File</description>
     <owner>Copyright 2001-2009 The Apache Software Foundation</owner>
 
+    <default-request request-uri="cms"/>
+
     <!-- Request Mappings -->
     <request-map uri="view">
         <security https="false" auth="false"/>
@@ -44,6 +46,14 @@
         <response name="success" type="view" value="showHelp"/>
     </request-map>
 
+    <request-map uri="cms">
+        <security https="true" auth="true"/>
+        <event type="java" path="org.ofbiz.content.cms.CmsEvents" invoke="cms"/>
+        <response name="success" type="none"/>
+        <response name="error" type="view" value="error"/>
+    </request-map>
+
+
     <view-map name="showHelp" type="screen" page="component://commonext/widget/HelpScreens.xml#ShowHelp"/>
     <view-map name="ShowDocument" type="screen" page="component://commonext/widget/HelpScreens.xml#showDocument"/>
     

Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Thu Sep 10 08:49:30 2009
@@ -79,7 +79,10 @@
                     </condition>
                     <actions>
                         <set field="title" value="${uiLabelMap.CommonExtHelpTitle}"/>
-                        <set field="contentId" value="${parameters.helpTopic}" default-value="HELP_ROOT"/>
+                        <entity-and entity-name="ContentAssoc" list="contentAssocs">
+                            <field-map field-name="mapKey" from-field="parameters.helpTopic"/>
+                        </entity-and>
+                        <set field="contentId" from-field="contentAssocs[0].contentIdTo"/>
                         <entity-one entity-name="Content" value-field="content"/>
                     </actions>
                     <widgets>
@@ -137,7 +140,7 @@
             </actions>
             <widgets>
                 <container id="Document">
-                    <content content-id="${contentId}"/>
+                    <content content-id="${contentId}" />
                 </container>
             </widgets>
         </section>

Modified: ofbiz/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Thu Sep 10 08:49:30 2009
@@ -36,6 +36,6 @@
 
     <DataResource dataResourceId="CONTENT_SITE_FindWeb" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="CONTENT_SITE_FindWeb" contentTypeId="DOCUMENT" contentName="Content Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="CONTENT_SITE_FindWeb" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_SITE_FindWebSite"/>
 
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT.xml (original)
+++ ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT.xml Thu Sep 10 08:49:30 2009
@@ -24,7 +24,7 @@
     <title>Welcome to the Apache OFBiz help system</title>
     <section>
         <para>If you arrived at this page without selecting the index,
-            then a specific help page was yet available</para>
+            then a specific help page was not yet available</para>
     </section>
     <section>
         <para>

Modified: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml Thu Sep 10 08:49:30 2009
@@ -30,7 +30,7 @@
     <DataResource dataResourceId="MARKETING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Marketing Main Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="MARKETING_main" contentTypeId="DOCUMENT" contentName="MARKETING Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_MARKETING" contentIdTo="MARKETING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_MARKETING" contentIdTo="MARKETING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="MARKETING_main"/>
 
     <!-- Chapter SFA -->
     <DataResource dataResourceId="HELP_SFA" localeString="en" dataResourceTypeId="OFBIZ_FILE"
@@ -44,25 +44,25 @@
     <DataResource dataResourceId="SFA_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Main Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_main" contentTypeId="DOCUMENT" contentName="SFA Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="SFA_main"/>
 
     <DataResource dataResourceId="SFA_FindLeads" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Leads find/list Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_FindLeads" contentTypeId="DOCUMENT" contentName="SFA Leads find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindLeads" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindLeads" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindLeads" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="SFA_FindLeads"/>
 
     <DataResource dataResourceId="SFA_FindAccounts" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Accounts find/list Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_FindAccounts" contentTypeId="DOCUMENT" contentName="SFA Accounts find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindAccounts" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindAccounts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindAccounts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="SFA_FindAccounts"/>
 
     <DataResource dataResourceId="SFA_FindContacts" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Contacts find/list Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_FindContacts" contentTypeId="DOCUMENT" contentName="SFA Contacts find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindContacts" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindContacts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindContacts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="SFA_FindContacts"/>
 
     <DataResource dataResourceId="SFA_FindSalesOpportu" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA SalesOpportunities find/list Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_FindSalesOpportu" contentTypeId="DOCUMENT" contentName="SFA SalesOpportunities find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindSalesOpportu" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindSalesOpportu" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindSalesOpportu" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="SFA_FindSalesOpportunities"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/product/data/ProductHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductHelpData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Thu Sep 10 08:49:30 2009
@@ -24,6 +24,6 @@
 
     <DataResource dataResourceId="PRODCATALOG_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/product/data/helpdata/HELP_PRODCATALOG_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="PRODCATALOG_main" contentTypeId="DOCUMENT" contentName="Main Catalog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="PRODCATALOG_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_PRODUCT" contentIdTo="PRODCATALOG_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_PRODUCT" contentIdTo="PRODCATALOG_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PRODCATALOG_main"/>
 
 </entity-engine-xml>

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=813311&r1=813310&r2=813311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Thu Sep 10 08:49:30 2009
@@ -21,22 +21,15 @@
   <#assign helpUrlPrefix = "" />
   <#assign helpUrlSuffix = "" />
 
-  <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
-    <#if (helpTopic?length > 20)>
-     <#assign len = helpTopic?length - 5/>
-     <#assign helpTopic = helpTopic?substring(0,15) + helpTopic?substring(len)/>
-    </#if>
+
 <#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
 ${helpTopic}
 -->
-    <#assign helpContent = delegator.findByAnd("Content", {"contentId" : helpTopic})>
-    <#if !helpContent?has_content>
-      <#assign helpContent = delegator.findByAnd("Content", {"contentId" : webSiteId})>
-    </#if>
-    <#if !helpContent?has_content>
-        <#assign helpTopic = "navigateHelp"/>
-    </#if>
+  <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
+    <#assign helpContent = "Y"> <!-- content in ofbiz -->
   </#if>
+  
+  <!-- content in confluence -->
   <#if helpUrlsMap["Prefix"] != "Prefix">
     <#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
   </#if>


Free forum by Nabble Edit this page