Author: jleroux
Date: Tue Jan 23 08:36:01 2018
New Revision: 1821966
URL: http://svn.apache.org/viewvc?rev=1821966&view=rev
Log:
"Applied fix from trunk for revision: 1821965 "
------------------------------------------------------------------------
r1821965 | jleroux | 2018-01-23 09:34:04 +0100 (mar., 23 janv. 2018) | 6 lines
Fixed: Rainbow theme: bug in avatar.ftl when the last name does not exist
(OFBIZ-10177)
Both 1st and last names must be present else it's confusing and better to show
the username
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 23 08:36:01 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl?rev=1821966&r1=1821965&r2=1821966&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl
Tue Jan 23 08:36:01 2018
@@ -31,13 +31,9 @@ under the License.
<img src="/rainbowstone/images/avatar.svg" alt="user">
</#if>
<div id="user-name" <#if
userLogin.partyId??>onclick="javascript:location.href='/partymgr/control/viewprofile?partyId=${userLogin.partyId}'"</#if>>
- <#if person?exists>
- <#if person.firstName??>
- <span>${person.firstName}</span>
- <span>${person.lastName?upper_case}</span>
- <#else>
- <span>${userLogin.userLoginId}</span>
- </#if>
+ <#if (person.firstName)?? && (person.lastName)??>
+ <span>${person.firstName}</span>
+ <span>${person.lastName?upper_case}</span>
<#else>
<span>${userLogin.userLoginId}</span>
</#if>
