github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +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

4
script/import_scripts/vbulletin.rb
View File

@ -181,7 +181,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
name: @htmlentities.decode(category["title"]).strip,
position: category["displayorder"],
description: @htmlentities.decode(category["description"]).strip,
parent_category_id: category_from_imported_category_id(category["parentid"]).try(:[], "id")
parent_category_id: category_id_from_imported_category_id(category["parentid"])
}
end
end
@ -216,7 +216,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
id: topic_id,
user_id: user_id_from_imported_user_id(topic["postuserid"]) || Discourse::SYSTEM_USER_ID,
title: @htmlentities.decode(topic["title"]).strip[0...255],
category: category_from_imported_category_id(topic["forumid"]).try(:name),
category: category_id_from_imported_category_id(topic["forumid"]),
raw: raw,
created_at: parse_timestamp(topic["dateline"]),
visible: topic["visible"].to_i == 1,