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

Merge pull request #1860 from ecuk/embed-category

Browse source 
Add site setting for category of topics created by embedding
This commit is contained in:
Robin Ward 2014-01-24 07:40:10 -08:00
commit 8493f4ad27
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/topic_embed.rb
View file

@ -19,7 +19,12 @@ class TopicEmbed < ActiveRecord::Base
# If there is no embed, create a topic, post and the embed. # If there is no embed, create a topic, post and the embed.
if embed.blank? if embed.blank?
Topic.transaction do 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 post = creator.create
if post.present? if post.present?
TopicEmbed.create!(topic_id: post.topic_id, TopicEmbed.create!(topic_id: post.topic_id,

1
config/locales/server.en.yml
View file

@ -794,6 +794,7 @@ en:
feed_polling_enabled: "Whether to import a RSS/ATOM feed as posts" feed_polling_enabled: "Whether to import a RSS/ATOM feed as posts"
feed_polling_url: "URL of RSS/ATOM feed to import" feed_polling_url: "URL of RSS/ATOM feed to import"
embed_by_username: "Discourse username of the user who creates the topics" 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" embed_post_limit: "Maximum number of posts to embed"
notification_types: notification_types:

1
config/site_settings.yml
View file

@ -356,6 +356,7 @@ embedding:
feed_polling_enabled: false feed_polling_enabled: false
feed_polling_url: '' feed_polling_url: ''
embed_by_username: '' embed_by_username: ''
embed_category: ''
embed_post_limit: 100 embed_post_limit: 100
uncategorized: uncategorized: