Merge pull request #207 from hmhealey/mm825
MM-825 Fixed the labels on the mention list for users without their first/last name configured
Этот коммит содержится в:
@@ -7,6 +7,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
|||||||
var Mention = require('./mention.jsx');
|
var Mention = require('./mention.jsx');
|
||||||
|
|
||||||
var Constants = require('../utils/constants.jsx');
|
var Constants = require('../utils/constants.jsx');
|
||||||
|
var Utils = require('../utils/utils.jsx');
|
||||||
var ActionTypes = Constants.ActionTypes;
|
var ActionTypes = Constants.ActionTypes;
|
||||||
|
|
||||||
var MAX_HEIGHT_LIST = 292;
|
var MAX_HEIGHT_LIST = 292;
|
||||||
@@ -194,7 +195,7 @@ module.exports = React.createClass({
|
|||||||
<Mention
|
<Mention
|
||||||
ref={'mention' + index}
|
ref={'mention' + index}
|
||||||
username={users[i].username}
|
username={users[i].username}
|
||||||
secondary_text={users[i].first_name + " " + users[i].last_name}
|
secondary_text={Utils.getFullName(users[i])}
|
||||||
id={users[i].id}
|
id={users[i].id}
|
||||||
listId={index}
|
listId={index}
|
||||||
isFocused={this.state.selectedMention === index ? "mentions-focus" : ""}
|
isFocused={this.state.selectedMention === index ? "mentions-focus" : ""}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user