github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Importers should allow categories with existing name if the parent category is different

Browse Source 
This changes the content of `@categories_lookup` from `Category` objects
to IDs since the category names aren't needed anymore. The lookup
method has been renamed too.
This commit is contained in:
Gerhard Schlager
2015-03-12 21:15:02 +01:00
parent 091af27a31
commit b5426763e4
14 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
script/import_scripts/vanilla.rb
View File

@ -144,8 +144,7 @@ class ImportScripts::Vanilla < ImportScripts::Base
description: clean_up(category[:description]),
}
if category[:parent_category_id] != "-1"
parent_category = category_from_imported_category_id(category[:parent_category_id])
c[:parent_category_id] = parent_category.id if parent_category
c[:parent_category_id] = category_id_from_imported_category_id(category[:parent_category_id])
end
c
end
@ -162,7 +161,7 @@ class ImportScripts::Vanilla < ImportScripts::Base
id: "discussion#" + discussion[:discussion_id],
user_id: user_id_from_imported_user_id(discussion[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
title: discussion[:name],
category: category_from_imported_category_id(discussion[:category_id]).try(:name),
category: category_id_from_imported_category_id(discussion[:category_id]),
raw: clean_up(discussion[:body]),
created_at: parse_date(discussion[:date_inserted]),
}