diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-07-11 12:05:03 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2016-07-11 12:05:03 +0200 |
| commit | 855f56c61a39b03442c4962e3afabd80f7fcd721 (patch) | |
| tree | bbf99e40cac830f1b96b83202682419f9f0b7644 | |
| parent | 36f17a57171bce23840f67c89ef25361cd2b49f6 (diff) | |
| download | wekan-855f56c61a39b03442c4962e3afabd80f7fcd721.tar.gz wekan-855f56c61a39b03442c4962e3afabd80f7fcd721.tar.bz2 wekan-855f56c61a39b03442c4962e3afabd80f7fcd721.zip | |
profile.name is called profile.fullname (#615)
The name of the profile field was changed log ago. This fixes the
remaining wrong references.
| -rw-r--r-- | client/components/import/import.jade | 4 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.jade | 2 | ||||
| -rw-r--r-- | models/users.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/client/components/import/import.jade b/client/components/import/import.jade index e10072b4..d4def7d8 100644 --- 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 index 893b5164..4f5586cb 100644 --- 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 index 4e4a0fac..b45dedd2 100644 --- 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, ''); } }); |