diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:57:43 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:57:43 -0400 |
| commit | 0f54233f668901fde880f18354f406b981fc4d6d (patch) | |
| tree | 19d9d823a138cf78d7fa038c0ce61fbf30309eed /store/sql_channel_store.go | |
| parent | d5c5ae0939bcff58110b88559b2122394b656735 (diff) | |
| parent | beef8f776f4a47169ce03783b2985b40d30572f2 (diff) | |
| download | chat-0f54233f668901fde880f18354f406b981fc4d6d.tar.gz chat-0f54233f668901fde880f18354f406b981fc4d6d.tar.bz2 chat-0f54233f668901fde880f18354f406b981fc4d6d.zip | |
Merge pull request #277 from mattermost/mm-1741
MM-1741 updated channel error messages to reflect proper naming
Diffstat (limited to 'store/sql_channel_store.go')
| -rw-r--r-- | store/sql_channel_store.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index f64558a92..ce1a8c6fa 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -84,9 +84,9 @@ func (s SqlChannelStore) Save(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name = :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Save", "We couldn't save the channel", "id="+channel.Id+", "+err.Error()) @@ -122,9 +122,9 @@ func (s SqlChannelStore) Update(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name= :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Update", "We encounted an error updating the channel", "id="+channel.Id+", "+err.Error()) |