diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-05-06 08:06:34 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-06 08:06:34 -0400 |
| commit | d75cb0294896e0e45f280cbccde8581376d501ce (patch) | |
| tree | 0d82a1d959945aa2a2e73633233d9c681212f209 /store | |
| parent | 4b2843ee9d513a6b464e1e581e9cee8baaaa4317 (diff) | |
| download | chat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.gz chat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.bz2 chat-d75cb0294896e0e45f280cbccde8581376d501ce.zip | |
Multiple cross-team functionality fixes (#2902)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_channel_store.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 6d549c7f0..9f9d86454 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -13,6 +13,7 @@ import ( const ( MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" MISSING_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" + CHANNEL_EXISTS_ERROR = "store.sql_channel.save_channel.exists.app_error" ) type SqlChannelStore struct { @@ -102,6 +103,7 @@ func (s SqlChannelStore) SaveDirectChannel(directchannel *model.Channel, member1 if channelResult.Err != nil { transaction.Rollback() result.Err = channelResult.Err + result.Data = channelResult.Data } else { newChannel := channelResult.Data.(*model.Channel) // Members need new channel ID @@ -167,9 +169,10 @@ func (s SqlChannelStore) saveChannelT(transaction *gorp.Transaction, channel *mo dupChannel := model.Channel{} s.GetMaster().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.NewLocAppError("SqlChannelStore.Update", "store.sql_channel.save_channel.previously.app_error", nil, "id="+channel.Id+", "+err.Error()) + result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.previously.app_error", nil, "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewLocAppError("SqlChannelStore.Update", "store.sql_channel.save_channel.exists.app_error", nil, "id="+channel.Id+", "+err.Error()) + result.Err = model.NewLocAppError("SqlChannelStore.Save", CHANNEL_EXISTS_ERROR, nil, "id="+channel.Id+", "+err.Error()) + result.Data = &dupChannel } } else { result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.save.app_error", nil, "id="+channel.Id+", "+err.Error()) |