svn commit: r1082016 - in /ofbiz/trunk: applications/commonext/widget/CommonScreens.xml framework/common/webcommon/includes/helplink.ftl

[adrianc]

Author: adrianc
Date: Wed Mar 16 00:46:40 2011
New Revision: 1082016

URL: http://svn.apache.org/viewvc?rev=1082016&view=rev
Log:
Removed a framework dependency on the Content component.

Modified:
    ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
    ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl

Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1082016&r1=1082015&r2=1082016&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Wed Mar 16 00:46:40 2011
@@ -43,6 +43,11 @@ under the License.
                 <set field="layoutSettings.middleTopLink2" value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/>
                 <set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16) + &quot; &quot; + resultNote.lastSystemInfoNote3.noteInfo:&quot;&quot;}"/>
                 <set field="layoutSettings.middleTopLink3" value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/>
+                <!-- Help link actions -->
+                <set field="helpTopic" from-field="webSiteId + '_' + requestAttributes._CURRENT_VIEW_"/>
+                <entity-and list="pageAvail" entity-name="ContentAssoc">
+                    <field-map field-name="mapKey" from-field="helpTopic"/>
+                </entity-and>
             </actions>
             <widgets>
                 <section>

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=1082016&r1=1082015&r2=1082016&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Wed Mar 16 00:46:40 2011
@@ -17,10 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-  <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
-
-<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
-${helpTopic}
+<#-- uncomment this to show the current screen help topic key (this is useful to cut and paste in the help link resources files
+${helpTopic?if_exists}
 -->
-  <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/>