From 6766451ab4eaece4ae1fb226892f17c60c58681a Mon Sep 17 00:00:00 2001 From: Eric Carlson Date: Thu, 23 Jan 2014 22:25:48 -0700 Subject: [PATCH] Add site setting for category of topics created by embedding --- app/models/topic_embed.rb | 7 ++++++- config/locales/server.en.yml | 1 + config/site_settings.yml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index c369074de..889abb726 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -19,7 +19,12 @@ class TopicEmbed < ActiveRecord::Base # If there is no embed, create a topic, post and the embed. if embed.blank? Topic.transaction do - creator = PostCreator.new(user, title: title, raw: absolutize_urls(url, contents), skip_validations: true, cook_method: Post.cook_methods[:raw_html]) + creator = PostCreator.new(user, + title: title, + raw: absolutize_urls(url, contents), + skip_validations: true, + cook_method: Post.cook_methods[:raw_html], + category: SiteSetting.embed_category) post = creator.create if post.present? TopicEmbed.create!(topic_id: post.topic_id, diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index fa807b538..8220ee5f5 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -794,6 +794,7 @@ en: feed_polling_enabled: "Whether to import a RSS/ATOM feed as posts" feed_polling_url: "URL of RSS/ATOM feed to import" embed_by_username: "Discourse username of the user who creates the topics" + embed_category: "Category of created topics" embed_post_limit: "Maximum number of posts to embed" notification_types: diff --git a/config/site_settings.yml b/config/site_settings.yml index 551ef539e..6e8fcffe9 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -356,6 +356,7 @@ embedding: feed_polling_enabled: false feed_polling_url: '' embed_by_username: '' + embed_category: '' embed_post_limit: 100 uncategorized: