浏览代码

profile name changed fullname and comma hotfix.

Yasar icli 10 年之前
父节点
当前提交
a79599d76c

+ 1 - 1
client/components/boards/boardList.js

@@ -29,7 +29,7 @@ BlazeComponent.extendComponent({
       'click .js-star-board': function(evt) {
         Meteor.user().toggleBoardStar(this._id);
         evt.preventDefault();
-      },
+      }
     }];
   }
 }).register('boardList');

+ 1 - 1
client/components/cards/details.jade

@@ -97,7 +97,7 @@ template(name="cardMembersPopup")
         a.name.js-select-member(href="#")
           +userAvatar(userId=user._id)
           span.full-name
-            = user.profile.name
+            = user.profile.fullname
             | (<span class="username">{{ user.username }}</span>)
           if isCardMember
             i.fa.fa-check

+ 4 - 4
client/components/sidebar/sidebar.jade

@@ -53,7 +53,7 @@ template(name="memberPopup")
       .info
         h3.bottom
           .js-profile
-            = user.profile.name
+            = user.profile.fullname
         p.quiet.bottom @#{user.username}
 
     if currentUser.isBoardMember
@@ -73,7 +73,7 @@ template(name="memberPopup")
 
 
 template(name="removeMemberPopup")
-  p {{_ 'remove-member-pop' name=user.profile.name username=user.username boardTitle=board.title}}
+  p {{_ 'remove-member-pop' name=user.profile.fullname username=user.username boardTitle=board.title}}
   button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}}
 
 template(name="addMemberPopup")
@@ -83,10 +83,10 @@ template(name="addMemberPopup")
   ul.pop-over-member-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)
           span.full-name
-            = profile.name
+            = profile.fullname
             | (<span class="username">{{ username }}</span>)
           if isBoardMember
             .extra-text.quiet ({{_ 'joined'}})

+ 2 - 2
client/components/sidebar/sidebarFilters.jade

@@ -25,7 +25,7 @@ template(name="filterSidebar")
             a.name.js-toogle-member-filter
               +userAvatar(userId=this._id)
               span.sidebar-list-item-description
-                = profile.name
+                = profile.fullname
                 | (<span class="username">{{ username }}</span>)
               if Filter.members.isSelected _id
                 i.fa.fa-check
@@ -62,7 +62,7 @@ template(name="multiselectionSidebar")
             a.name.js-toogle-member-multiselection
               +userAvatar(userId=this._id)
               span.sidebar-list-item-description
-                = profile.name
+                = profile.fullname
                 | (<span class="username">{{ username }}</span>)
               if allSelectedElementHave 'member' _id
                 i.fa.fa-check

+ 2 - 2
client/components/users/userHeader.jade

@@ -2,8 +2,8 @@ template(name="headerUserBar")
   #header-user-bar
     a.header-user-bar-name.js-open-header-member-menu
       i.fa.fa-chevron-down
-      if currentUser.profile.name
-        = currentUser.profile.name
+      if currentUser.profile.fullname
+        = currentUser.profile.fullname
       else
         = currentUser.username
     a.header-user-bar-avatar.js-change-avatar