From 36a80871a39b7f4f01bf93dc1ed3f45eb2d0e674 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 24 Nov 2016 17:12:29 -0500 Subject: [PATCH] FIX: category_importer was importing public categories so that no one had permission to them, not even staff --- lib/import_export/category_importer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/import_export/category_importer.rb b/lib/import_export/category_importer.rb index 9b21b7aa265..25b57acfcb9 100644 --- a/lib/import_export/category_importer.rb +++ b/lib/import_export/category_importer.rb @@ -47,7 +47,7 @@ module ImportExport parent = Category.new(@export_data[:category]) parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id parent.custom_fields["import_id"] = id - parent.permissions = permissions if permissions + parent.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]} parent.save! set_category_description(parent, @export_data[:category][:description]) end @@ -62,7 +62,7 @@ module ImportExport subcategory.parent_category_id = parent.id subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id]) subcategory.custom_fields["import_id"] = id - subcategory.permissions = permissions if permissions + subcategory.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]} subcategory.save! set_category_description(subcategory, cat_attrs[:description]) end