svn commit: r1794008 - /ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl

Author: jleroux
Date: Fri May  5 10:48:29 2017
New Revision: 1794008

URL: http://svn.apache.org/viewvc?rev=1794008&view=rev
Log:
Fixed: Error viewing tomahawk-themed page when externalLoginKey is not enabled
(OFBIZ-9345)

An error occurs when the theme is set to *tomahawk* and
*security.login.externalLoginKey.enabled=false*

jleroux: using externalKeyParam in viewprofile fixes the issue.

But we don't need to create externalKeyParam  in AppBarClose.ftl.
It already exists in context

Thanks: James Yong

Modified:
    ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl?rev=1794008&r1=1794007&r2=1794008&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl Fri May  5 10:48:29 2017
@@ -85,7 +85,7 @@ under the License.
     <li <#if companyListSize?default(0) &lt;= 1>class="language"</#if>><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle}</a></li>
     <#if userLogin?exists>
       <#if userLogin.partyId?exists>
-        <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}&externalLoginKey=${externalLoginKey}">${userName}</a>&nbsp;&nbsp;&nbsp;&nbsp;</li>
+        <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam!}">${userName}</a>&nbsp;&nbsp;&nbsp;&nbsp;</li>
         <#assign size = companyListSize?default(0)>
         <#if size &gt; 1>
             <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>