summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-07-09 15:49:23 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-07-17 15:13:31 -0400
commit1c7f0be268046d2b509e23268eebcbbef78c5a24 (patch)
tree5da2b715ed681f2ec53bc7098f789803b3906d97 /web/react/components/user_settings.jsx
parentc09f1b9e4e5638080622ff9aa70735db382a16df (diff)
downloadchat-1c7f0be268046d2b509e23268eebcbbef78c5a24.tar.gz
chat-1c7f0be268046d2b509e23268eebcbbef78c5a24.tar.bz2
chat-1c7f0be268046d2b509e23268eebcbbef78c5a24.zip
Renamed all clientside references from full_name to nickname
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r--web/react/components/user_settings.jsx14
1 files changed, 7 insertions, 7 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 38e4b1aea..9ec7f64c9 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -316,8 +316,8 @@ var NotificationsTab = React.createClass({
if (this.props.activeSection === 'keys') {
var user = this.props.user;
var first_name = "";
- if (user.full_name.length > 0) {
- first_name = user.full_name.split(' ')[0];
+ if (user.nickname.length > 0) {
+ first_name = user.nickname.split(' ')[0];
}
var inputs = [];
@@ -399,7 +399,7 @@ var NotificationsTab = React.createClass({
if (this.state.first_name_key) {
var first_name = "";
var user = this.props.user;
- if (user.full_name.length > 0) first_name = user.full_name.split(' ')[0];
+ if (user.nickname.length > 0) first_name = user.nickname.split(' ')[0];
if (first_name != "") keys.push(first_name);
}
if (this.state.username_key) keys.push(this.props.user.username);
@@ -761,12 +761,12 @@ var GeneralTab = React.createClass({
var fullName = firstName + ' ' + lastName;
- if (user.full_name === fullName) {
+ if (user.nickname === fullName) {
this.setState({client_error: "You must submit a new name"})
return;
}
- user.full_name = fullName;
+ user.nickname = fullName;
this.submitUser(user);
},
@@ -861,7 +861,7 @@ var GeneralTab = React.createClass({
getInitialState: function() {
var user = this.props.user;
- var splitStr = user.full_name.split(' ');
+ var splitStr = user.nickname.split(' ');
var firstName = splitStr.shift();
var lastName = splitStr.join(' ');
@@ -913,7 +913,7 @@ var GeneralTab = React.createClass({
nameSection = (
<SettingItemMin
title="Name"
- describe={UserStore.getCurrentUser().full_name}
+ describe={UserStore.getCurrentUser().nickname}
updateSection={function(){self.updateSection("name");}}
/>
);