Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/discourse/discourse

This commit is contained in:
Jeff Atwood 2018-07-12 15:50:36 -07:00
parent 21de8411c9 71814009bd
commit 033ca0e605
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
script/bulk_import/discourse_merger.rb
View File

@ -349,7 +349,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
@sequences[Badge.sequence_name] = last_id + 1
copy_model(UserBadge, is_a_user_model: true, skip_if_merged: true)
copy_model(UserBadge, is_a_user_model: true)
end
def copy_model(klass, skip_if_merged: false, is_a_user_model: false, skip_processing: false, mapping: nil, select_sql: nil)
@ -435,7 +435,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
end
def process_topic(topic)
return nil if topic['category_id'].nil?
return nil if topic['category_id'].nil? && topic['archetype'] != Archetype.private_message
topic
end
@ -590,6 +590,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
def process_user_badge(user_badge)
user_badge['granted_by_id'] = user_id_from_imported_id(user_badge['granted_by_id']) if user_badge['granted_by_id']
user_badge['notification_id'] = notification_id_from_imported_id(user_badge['notification_id']) if user_badge['notification_id']
return nil if UserBadge.where(user_id: user_badge['user_id'], badge_id: user_badge['badge_id']).exists?
user_badge
end