diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-09-21 08:37:53 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-21 08:37:53 -0400 |
| commit | f399b08db324511031700b044245e66fa7492d85 (patch) | |
| tree | 8178e0684e80413c3fad5873f51c973624714fe0 | |
| parent | 4578138d578791cb1d403cb0fe4c0282a26e1a3a (diff) | |
| parent | e989b839d53471dec7c71146af88cd3197d14ffc (diff) | |
| download | chat-f399b08db324511031700b044245e66fa7492d85.tar.gz chat-f399b08db324511031700b044245e66fa7492d85.tar.bz2 chat-f399b08db324511031700b044245e66fa7492d85.zip | |
Merge pull request #729 from mattermost/rename-handle
Renaming "Handle" to "Channel URL" or "URL"
| -rw-r--r-- | api/channel_test.go | 4 | ||||
| -rw-r--r-- | store/sql_channel_store.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/channel_test.go b/api/channel_test.go index 7e9267192..14bfe1cf7 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -57,7 +57,7 @@ func TestCreateChannel(t *testing.T) { rchannel.Data.(*model.Channel).Id = "" if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that handle already exists" { + if err.Message != "A channel with that URL already exists" { t.Fatal(err) } } @@ -68,7 +68,7 @@ func TestCreateChannel(t *testing.T) { Client.DeleteChannel(savedId) if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that handle was previously created" { + if err.Message != "A channel with that URL was previously created" { t.Fatal(err) } } diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index bad878501..877246fc3 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -85,9 +85,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 handle was previously created", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that URL was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that URL 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()) |