github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:01:18 +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/smf2.rb
View File

@ -145,7 +145,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
FROM {prefix}boards
ORDER BY id_parent ASC, id_board ASC
SQL
parent_id = category_from_imported_category_id(board[:id_parent]).id if board[:id_parent] > 0
parent_id = category_id_from_imported_category_id(board[:id_parent]) if board[:id_parent] > 0
groups = (board[:member_groups] || "").split(/,/).map(&:to_i)
restricted = !groups.include?(GUEST_GROUP) && !groups.include?(MEMBER_GROUP)
{
@ -257,7 +257,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
end
}
if message[:id_msg] == message[:id_first_msg]
post[:category] = category_from_imported_category_id(message[:id_board]).try(:name)
post[:category] = category_id_from_imported_category_id(message[:id_board])
post[:title] = decode_entities(message[:subject])
else
parent = topic_lookup_from_imported_post_id(message[:id_first_msg])