diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-07-30 15:06:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 15:06:08 -0400 |
| commit | 5872bf9c2f9b81c7aad761d40a6970f6267f1424 (patch) | |
| tree | 2f850c0678f9fbd8979d41cb758503ca6cb1a2d7 /api4/channel.go | |
| parent | 65cd447a61efa852da2c0e7db25f385c2436e236 (diff) | |
| download | chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.tar.gz chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.tar.bz2 chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.zip | |
Pr 9039 (#9187)
* MM-11065: Allow to search and get archived channels from the API
* Fixing more tests
* Add some unit tests
* Add includeDeleted parameter to session permissions check function
* More test fixing
* Adding archive channels list in channels search
* Add restriction for archived channel edition
* Reverting permissions checks modification
* Changed the query parameter to include_deleted
* Enable search archive channels as true by default
* Adding tests for verify search on deleted channels
* Allowing to override archive channels during the imports
* Fixed test
* Search in archive channels from the API must be explicitly requested
* Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam
* Back to ViewArchivedChannels config
* Fixing tests
* Reverting GetChannelByName parameter
* Add include deleted parameter on GetChannel functions in plugins api
* Fixing tests
Diffstat (limited to 'api4/channel.go')
| -rw-r--r-- | api4/channel.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/api4/channel.go b/api4/channel.go index db34bf03c..0b8470975 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -589,7 +589,7 @@ func getChannelsForTeamForUser(c *Context, w http.ResponseWriter, r *http.Reques return } - channels, err := c.App.GetChannelsForUser(c.Params.TeamId, c.Params.UserId) + channels, err := c.App.GetChannelsForUser(c.Params.TeamId, c.Params.UserId, false) if err != nil { c.Err = err return @@ -709,7 +709,9 @@ func getChannelByName(c *Context, w http.ResponseWriter, r *http.Request) { var channel *model.Channel var err *model.AppError - if channel, err = c.App.GetChannelByName(c.Params.ChannelName, c.Params.TeamId); err != nil { + includeDeleted := r.URL.Query().Get("include_deleted") == "true" + + if channel, err = c.App.GetChannelByName(c.Params.ChannelName, c.Params.TeamId, includeDeleted); err != nil { c.Err = err return } @@ -744,7 +746,9 @@ func getChannelByNameForTeamName(c *Context, w http.ResponseWriter, r *http.Requ var channel *model.Channel var err *model.AppError - if channel, err = c.App.GetChannelByNameForTeamName(c.Params.ChannelName, c.Params.TeamName); err != nil { + includeDeleted := r.URL.Query().Get("include_deleted") == "true" + + if channel, err = c.App.GetChannelByNameForTeamName(c.Params.ChannelName, c.Params.TeamName, includeDeleted); err != nil { c.Err = err return } |