a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let's not default to mostviewed.

This commit is contained in:
Azareal 2019-02-23 18:16:54 +10:00
parent 7f6c1bada2
commit 633c9ef2ec
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
routes/topic_list.go
View File

@ -20,16 +20,15 @@ func wsTopicList(topicList []*common.TopicsRow, lastPage int) *common.WsTopicLis
} }
func TopicList(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header) common.RouteError { func TopicList(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header) common.RouteError {
return TopicListCommon(w, r, user, header, "lastupdated") return TopicListCommon(w, r, user, header, "lastupdated", "")
} }
func TopicListMostViewed(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header) common.RouteError { func TopicListMostViewed(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header) common.RouteError {
return TopicListCommon(w, r, user, header, "mostviewed") return TopicListCommon(w, r, user, header, "mostviewed", "most-viewed")
} }
// TODO: Implement search // TODO: Implement search
func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header, torder string) common.RouteError { func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, header *common.Header, torder string, tsorder string) common.RouteError {
header.Title = phrases.GetTitlePhrase("topics")
header.Zone = "topics" header.Zone = "topics"
header.Path = "/topics/" header.Path = "/topics/"
header.MetaDesc = header.Settings["meta_desc"].(string) header.MetaDesc = header.Settings["meta_desc"].(string)
@ -62,7 +61,6 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, h
} }
} }
//(t *Topic) WsTopicsRows() *WsTopicsRow
// TODO: Allow multiple forums in searches // TODO: Allow multiple forums in searches
// TODO: Simplify this block after initially landing search // TODO: Simplify this block after initially landing search
var topicList []*common.TopicsRow var topicList []*common.TopicsRow
@ -169,9 +167,9 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, h
// TODO: Pass a struct back rather than passing back so many variables // TODO: Pass a struct back rather than passing back so many variables
if user.IsSuperAdmin { if user.IsSuperAdmin {
topicList, forumList, paginator, err = common.TopicList.GetList(page, "most-viewed", fids) topicList, forumList, paginator, err = common.TopicList.GetList(page, tsorder, fids)
} else { } else {
topicList, forumList, paginator, err = common.TopicList.GetListByGroup(group, page, "most-viewed", fids) topicList, forumList, paginator, err = common.TopicList.GetListByGroup(group, page, tsorder, fids)
} }
if err != nil { if err != nil {
return common.InternalError(err, w, r) return common.InternalError(err, w, r)
@ -191,6 +189,7 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, h
return nil return nil
} }
header.Title = phrases.GetTitlePhrase("topics")
pi := common.TopicListPage{header, topicList, forumList, common.Config.DefaultForum, common.TopicListSort{torder, false}, paginator} pi := common.TopicListPage{header, topicList, forumList, common.Config.DefaultForum, common.TopicListSort{torder, false}, paginator}
return renderTemplate("topics", w, r, header, pi) return renderTemplate("topics", w, r, header, pi)
} }