summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-04-28 13:16:03 -0400
committerChristopher Speller <crspeller@gmail.com>2017-04-28 13:16:03 -0400
commit96906482cecb0df21c8e1a40a2ba00c13c0182a7 (patch)
tree3bb35ca9fe2a3beb212b5350116f7bb488d7a119 /api4
parent302ec17beed9128101ef61d69b45d3ee29e16f1e (diff)
downloadchat-96906482cecb0df21c8e1a40a2ba00c13c0182a7.tar.gz
chat-96906482cecb0df21c8e1a40a2ba00c13c0182a7.tar.bz2
chat-96906482cecb0df21c8e1a40a2ba00c13c0182a7.zip
PLT-6214 Move channel store and actions over to redux (#6235)
* Move channel store and actions over to redux * Fix style errors * Fix unit test * Various fixes * More fixes * Revert config changes
Diffstat (limited to 'api4')
-rw-r--r--api4/channel.go5
-rw-r--r--api4/channel_test.go2
2 files changed, 1 insertions, 6 deletions
diff --git a/api4/channel.go b/api4/channel.go
index 5d1651d74..c8235c5f1 100644
--- a/api4/channel.go
+++ b/api4/channel.go
@@ -456,11 +456,6 @@ func searchChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- if len(props.Term) == 0 {
- c.SetInvalidParam("term")
- return
- }
-
if !app.SessionHasPermissionToTeam(c.Session, c.Params.TeamId, model.PERMISSION_LIST_TEAM_CHANNELS) {
c.SetPermissionError(model.PERMISSION_LIST_TEAM_CHANNELS)
return
diff --git a/api4/channel_test.go b/api4/channel_test.go
index 3c9b6d720..345bbefaf 100644
--- a/api4/channel_test.go
+++ b/api4/channel_test.go
@@ -721,7 +721,7 @@ func TestSearchChannels(t *testing.T) {
search.Term = ""
_, resp = Client.SearchChannels(th.BasicTeam.Id, search)
- CheckBadRequestStatus(t, resp)
+ CheckNoError(t, resp)
search.Term = th.BasicChannel.Name
_, resp = Client.SearchChannels(model.NewId(), search)