codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support category names with spaces

Browse source
This commit is contained in:
Robin Ward 2013-02-12 17:39:31 -05:00
parent 8235d47bdd
commit 69c7b5aeed
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/discourse/routes/list_category_route.js.coffee
View file

@ -1,10 +1,13 @@
window.Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend window.Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend
serialize: (params) -> slug: params.get('slug')
setupController: (controller, model) -> setupController: (controller, model) ->
slug = Em.get(model, 'slug')
category = Discourse.get('site.categories').findProperty('slug', slug)
category ||= Discourse.Category.create(name: slug, slug: slug)
listController = @controllerFor('list') listController = @controllerFor('list')
listController.set('filterMode', "category/#{model.slug}") listController.set('filterMode', "category/#{category.get('slug')}")
listController.load("category/#{model.slug}").then (topicList) => listController.load("category/#{category.get('slug')}").then (topicList) =>
listController.set('canCreateTopic', topicList.get('can_create_topic')) listController.set('canCreateTopic', topicList.get('can_create_topic'))
listController.set('category', Discourse.Category.create(name: model.slug)) listController.set('category',category)
@controllerFor('listTopics').set('content', topicList) @controllerFor('listTopics').set('content', topicList)

2
app/controllers/list_controller.rb
View file

@ -35,7 +35,7 @@ class ListController < ApplicationController
list = nil list = nil
# If they choose uncategorized, return topics NOT in a category # If they choose uncategorized, return topics NOT in a category
if params[:category] == SiteSetting.uncategorized_name if params[:category] == Slug.for(SiteSetting.uncategorized_name) or params[:category] == SiteSetting.uncategorized_name
list = query.list_uncategorized list = query.list_uncategorized
else else
category = Category.where(slug: params[:category]).includes(:featured_users).first category = Category.where(slug: params[:category]).includes(:featured_users).first

2
app/models/category_list.rb
View file

@ -30,7 +30,7 @@ class CategoryList
uncategorized = Category.new({name: SiteSetting.uncategorized_name, uncategorized = Category.new({name: SiteSetting.uncategorized_name,
slug: SiteSetting.uncategorized_name, slug: Slug.for(SiteSetting.uncategorized_name),
featured_topics: uncategorized_topics}.merge(totals)) featured_topics: uncategorized_topics}.merge(totals))
# Find the appropriate place to insert it: # Find the appropriate place to insert it: