From 2219047c1a4b60fd5d06cb431ff2946e28f6f50a Mon Sep 17 00:00:00 2001
From: Vito Albano <valbano@MacPro.local>
Date: Mon, 3 Oct 2016 13:41:34 +0100
Subject: [PATCH] Fixed wrong method and style a little

---
 .../src/components/user-info.component.html               | 8 ++++----
 .../src/services/bpm-user.service.ts                      | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
index 41c334ce54..5a8b50db9c 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
@@ -16,8 +16,8 @@
                 for="user-profile">
             <ul class='detail-user-profile-list-mdl mdl-list'>
                 <div *ngIf="ecmUser">
-                    <span class="header-profile"><b>ECM</b></span>
                     <hr class="title-start">
+                    <span class="header-profile"><b>ECM</b></span>
                     <li class="mdl-list__item mdl-list__item--two-line">
                         <span class="mdl-list__item-primary-content">
                           <i class="mdl-list__item-avatar">
@@ -30,14 +30,14 @@
                         </span>
                         <span class="mdl-list__item-secondary-content custom-role-style">
                             <span class="role-label-user">Job Role</span>
-                            {{ecmUser.jobTitle}}
+                            {{ ecmUser.jobTitle ? ecmUser.jobTitle : 'N/A' }}
                         </span>
                     </li>
                 </div>
-
+                <br>
                 <div *ngIf="bpmUser">
-                    <span class="header-profile"><b>BPM</b></span>
                     <hr class="title-start">
+                    <span class="header-profile"><b>BPM</b></span>
                     <li class="mdl-list__item mdl-list__item--two-line">
                         <span class="mdl-list__item-primary-content">
                           <i class="mdl-list__item-avatar">
diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
index 9f2c5626dd..1c0dff5bce 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
@@ -60,7 +60,12 @@ export class BpmUserService {
      * Call js api to get current user profile picture
      */
     callApiGetProfilePicture() {
-        return this.authService.getAlfrescoApi().activiti.profileApi.getProfile();
+        try {
+            return this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture();
+        } catch (exc) {
+            console.error(exc);
+            return null;
+        }
     }
 
     /**