profile.name is called profile.fullname (wekan#615)

The name of the profile field was changed log ago. This fixes the remaining wrong references.
ready4god2513 · Jul 11, 2016 · 855f56c · 855f56c
1 parent 36f17a5
commit 855f56c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/client/components/import/import.jade b/client/components/import/import.jade
@@ -55,10 +55,10 @@ template(name="importMapMembersAddPopup")
     ul.pop-over-list
       +esEach(index="users")
         li.item.js-member-item
-          a.name.js-select-import(title="{{profile.name}} ({{username}})" data-id="{{_id}}")
+          a.name.js-select-import(title="{{profile.fullname}} ({{username}})" data-id="{{_id}}")
             +userAvatar(userId=_id esSearch=true)
             span.full-name
-              = profile.name
+              = profile.fullname
               | (<span class="username">{{username}}</span>)
       +ifEsIsSearching(index='users')
         +spinner

diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
@@ -102,7 +102,7 @@ template(name="addMemberPopup")
     ul.pop-over-list
       +esEach(index="users")
         li.item.js-member-item(class="{{#if isBoardMember}}disabled{{/if}}")
-          a.name.js-select-member(title="{{profile.name}} ({{username}})")
+          a.name.js-select-member(title="{{profile.fullname}} ({{username}})")
             +userAvatar(userId=_id esSearch=true)
             span.full-name
               = profile.fullname

diff --git a/models/users.js b/models/users.js
@@ -262,8 +262,8 @@ if (Meteor.isServer) {
 Users.before.insert((userId, doc) => {
   doc.profile = doc.profile || {};
 
-  if (!doc.username && doc.profile.name) {
-    doc.username = doc.profile.name.toLowerCase().replace(/\s/g, '');
+  if (!doc.username && doc.profile.fullname) {
+    doc.username = doc.profile.fullname.toLowerCase().replace(/\s/g, '');
   }
 });