codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-10 23:28:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

support 'read_restricted' categories in importers

Browse source
This commit is contained in:
Régis Hanol 2016-07-27 18:38:23 +02:00
parent 0fa8fb1774
commit 56d2626187
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
script/import_scripts/base.rb
View file

@ -389,12 +389,13 @@ class ImportScripts::Base
new_category = Category.new( new_category = Category.new(
name: opts[:name], name: opts[:name],
user_id: opts[:user_id] || opts[:user].try(:id) || -1, user_id: opts[:user_id] || opts[:user].try(:id) || Discourse::SYSTEM_USER_ID,
position: opts[:position], position: opts[:position],
description: opts[:description], description: opts[:description],
parent_category_id: opts[:parent_category_id], parent_category_id: opts[:parent_category_id],
color: opts[:color] || "AB9364", color: opts[:color] || "AB9364",
text_color: opts[:text_color] || "FFF", text_color: opts[:text_color] || "FFF",
read_restricted: opts[:read_restricted] || false,
) )
new_category.custom_fields["import_id"] = import_id if import_id new_category.custom_fields["import_id"] = import_id if import_id
@ -466,7 +467,7 @@ class ImportScripts::Base
[created, skipped] [created, skipped]
end end
STAFF_GUARDIAN = Guardian.new(User.find(-1)) STAFF_GUARDIAN ||= Guardian.new(Discourse.system_user)
def create_post(opts, import_id) def create_post(opts, import_id)
user = User.find(opts[:user_id]) user = User.find(opts[:user_id])