PLT-7092 Fixed creation of PostList with null Posts fields (#6924)

This commit is contained in:
Harrison Healey
2017-07-13 08:12:11 -04:00
committed by Joram Wilander
parent 9a654d7b27
commit 4eed88e0c2
3 changed files with 4 additions and 6 deletions
+2 -3
View File
@@ -602,16 +602,15 @@ func getMyChannelMembers(c *Context, w http.ResponseWriter, r *http.Request) {
func getPinnedPosts(c *Context, w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
channelId := params["channel_id"]
posts := &model.PostList{}
if result := <-app.Srv.Store.Channel().GetPinnedPosts(channelId); result.Err != nil {
c.Err = result.Err
return
} else {
posts = result.Data.(*model.PostList)
posts := result.Data.(*model.PostList)
w.Write([]byte(posts.ToJson()))
}
w.Write([]byte(posts.ToJson()))
}
func addMember(c *Context, w http.ResponseWriter, r *http.Request) {
+1 -1
View File
@@ -361,7 +361,7 @@ func (s SqlChannelStore) GetPinnedPosts(channelId string) StoreChannel {
go func() {
result := StoreResult{}
pl := &model.PostList{}
pl := model.NewPostList()
var posts []*model.Post
if _, err := s.GetReplica().Select(&posts, "SELECT * FROM Posts WHERE IsPinned = true AND ChannelId = :ChannelId AND DeleteAt = 0 ORDER BY CreateAt ASC", map[string]interface{}{"ChannelId": channelId}); err != nil {
+1 -2
View File
@@ -910,8 +910,7 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP
result := StoreResult{}
if !*utils.Cfg.ServiceSettings.EnablePostSearch {
list := &model.PostList{}
list.MakeNonNil()
list := model.NewPostList()
result.Data = list
result.Err = model.NewLocAppError("SqlPostStore.Search", "store.sql_post.search.disabled", nil, fmt.Sprintf("teamId=%v userId=%v params=%v", teamId, userId, params.ToJson()))