diff options
| author | Ryan Wang <R-Wang97@users.noreply.github.com> | 2017-03-14 11:35:23 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-14 15:35:23 +0000 |
| commit | 242d2cec1b9235ed48da733d89218f1e51a98415 (patch) | |
| tree | fd605d1caf8d5bfc523d0ebcd4b73ff6ddc57aa4 /webapp | |
| parent | ad0ed008fe54534fcc089f479df606ab921901a9 (diff) | |
| download | chat-242d2cec1b9235ed48da733d89218f1e51a98415.tar.gz chat-242d2cec1b9235ed48da733d89218f1e51a98415.tar.bz2 chat-242d2cec1b9235ed48da733d89218f1e51a98415.zip | |
Allow saving of identical team name (#5738)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/team_general_tab.jsx | 9 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/webapp/components/team_general_tab.jsx b/webapp/components/team_general_tab.jsx index 0100cad64..bc6c70e7f 100644 --- a/webapp/components/team_general_tab.jsx +++ b/webapp/components/team_general_tab.jsx @@ -106,14 +106,11 @@ class GeneralTab extends React.Component { let valid = true; const name = this.state.name.trim(); - if (!name) { + if (name) { + state.clientError = ''; + } else { state.clientError = Utils.localizeMessage('general_tab.required', 'This field is required'); valid = false; - } else if (name === this.props.team.display_name) { - state.clientError = Utils.localizeMessage('general_tab.chooseName', 'Please choose a new name for your team'); - valid = false; - } else { - state.clientError = ''; } this.setState(state); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 33b905606..cb08c9b5e 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1329,7 +1329,6 @@ "flag_post.flag": "Flag for follow up", "flag_post.unflag": "Unflag", "general_tab.chooseDescription": "Please choose a new description for your team", - "general_tab.chooseName": "Please choose a new name for your team", "general_tab.codeDesc": "Click 'Edit' to regenerate Invite Code.", "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by {getTeamInviteLink} in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.", "general_tab.codeTitle": "Invite Code", |