Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source 
The name of the profile field was changed log ago. This fixes the
remaining wrong references.
This commit is contained in:
Alexander Sulfrian 2016-07-11 12:05:03 +02:00 • committed by Maxime Quandalle
parent 36f17a5717
commit 855f56c61a
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/import/import.jade
View file

@ -55,10 +55,10 @@ template(name="importMapMembersAddPopup")
ul.pop-over-list ul.pop-over-list
+esEach(index="users") +esEach(index="users")
li.item.js-member-item 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) +userAvatar(userId=_id esSearch=true)
span.full-name span.full-name
= profile.name = profile.fullname
| (<span class="username">{{username}}</span>) | (<span class="username">{{username}}</span>)
+ifEsIsSearching(index='users') +ifEsIsSearching(index='users')
+spinner +spinner

2
client/components/sidebar/sidebar.jade
View file

@ -102,7 +102,7 @@ template(name="addMemberPopup")
ul.pop-over-list ul.pop-over-list
+esEach(index="users") +esEach(index="users")
li.item.js-member-item(class="{{#if isBoardMember}}disabled{{/if}}") 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) +userAvatar(userId=_id esSearch=true)
span.full-name span.full-name
= profile.fullname = profile.fullname

4
models/users.js
View file

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