summary refs log tree commit diff
path: root/webclient/settings/settings.html
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-29 18:22:05 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-29 18:23:18 +0200
commit67f42b2f26a6ea76ec480167c58e1fa115809e23 (patch)
treedb3a706f5fec93ad239f5aeb777cf8411e522327 /webclient/settings/settings.html
parentupdate presence times in realtime through the magic of two-way binding (diff)
downloadsynapse-67f42b2f26a6ea76ec480167c58e1fa115809e23.tar.xz
Get user display name and avatar from the server rather than storing them in the local storage
Diffstat (limited to 'webclient/settings/settings.html')
-rw-r--r--webclient/settings/settings.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index d06a0083fa..51884e7209 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -1,4 +1,4 @@
-<div ng-controller="SettingsController" class="user">
+<div ng-controller="SettingsController" class="user" data-ng-init="onInit()">
 
     <div id="page">
     <div id="wrapper">
@@ -10,7 +10,7 @@
                     <tr>
                         <td>
                             <div class="profile-avatar">
-                                <img ng-src="{{ profile.avatarUrl || 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/>
+                                <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/>
                             </div>
                         </td>
                         <td>
@@ -19,7 +19,7 @@
                             </div>
                         </td>
                         <td>
-                            <button ng-disabled="(profile.displayName == config.displayName) && (profile.avatarUrl == config.avatarUrl)"
+                            <button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)"
                                     ng-click="saveProfile()">Save</button>    
                         </td>
                     </tr>