Merge pull request #1673 from aperrault/patch-04

Fixing neglect to determine whether a user has the permission to create ...
This commit is contained in:
Robin Ward
2013-11-19 10:50:38 -08:00
4 changed files with 17 additions and 3 deletions
+4
View File
@@ -11,6 +11,9 @@ class ListController < ApplicationController
user = list_target_user
list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
list.more_topics_url = construct_url_with(filter, list_opts)
if list_opts.include?(:category)
list.category = Category.where(name: list_opts[:category]).first
end
if [:latest, :hot].include?(filter)
@description = SiteSetting.site_description
@rss = filter
@@ -51,6 +54,7 @@ class ListController < ApplicationController
query = TopicQuery.new(current_user, list_opts)
list = query.list_latest
list.more_topics_url = construct_url_with(:latest, list_opts)
list.category = @category if @category
respond(list)
end