svn commit: r1794009 - in /ofbiz/branches/release16.11: ./ themes/tomahawk/template/AppBarClose.ftl

Author: jleroux
Date: Fri May  5 10:49:27 2017
New Revision: 1794009

URL: http://svn.apache.org/viewvc?rev=1794009&view=rev
Log:
"Applied fix from trunk framework for revision: 1794008  "
------------------------------------------------------------------------
r1794008 | jleroux | 2017-05-05 12:48:29 +0200 (ven. 05 mai 2017) | 12 lignes

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/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/themes/tomahawk/template/AppBarClose.ftl

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  5 10:49:27 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792638
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792638,1794008
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/themes/tomahawk/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/themes/tomahawk/template/AppBarClose.ftl?rev=1794009&r1=1794008&r2=1794009&view=diff
==============================================================================
--- ofbiz/branches/release16.11/themes/tomahawk/template/AppBarClose.ftl (original)
+++ ofbiz/branches/release16.11/themes/tomahawk/template/AppBarClose.ftl Fri May  5 10:49:27 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)>