github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +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/discuz_x.rb
View File

@ -171,8 +171,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
position: row['position'].to_i + max_position
}
if row['parent_id'].to_i > 0
parent = category_from_imported_category_id(row['parent_id'])
h[:parent_category_id] = parent.id if parent
h[:parent_category_id] = category_id_from_imported_category_id(row['parent_id'])
end
h
end
@ -217,7 +216,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
mapped[:created_at] = Time.zone.at(m['post_time'])
if m['is_first_post'] == 1
mapped[:category] = category_from_imported_category_id(m['category_id']).try(:name)
mapped[:category] = category_id_from_imported_category_id(m['category_id'])
mapped[:title] = CGI.unescapeHTML(m['title'])
@first_post_id_by_topic_id[m['topic_id']] = m['id']
else