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

FIX: Correct path to ImportExport module (#8227) 

During the move from Classic autoloader to Zeitwerk import_export module was moved to correct file name convention.
427d54b2b0 (diff-d896ec33b95afb7fae9f8bfe73d0580b)

Problem is that export/import is still using old path to require that module

Meta: https://meta.discourse.org/t/topic-and-category-export-import/38930/40
This commit is contained in:
Krzysztof Kotlarek 2019-10-23 17:27:14 +11:00 committed by Sam
parent f69dacf979
commit f34a0141c7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tasks/export.rake
View File

@ -2,7 +2,7 @@
desc 'Export all the categories' desc 'Export all the categories'
task 'export:categories', [:category_ids] => [:environment] do |_, args| task 'export:categories', [:category_ids] => [:environment] do |_, args|
require "import_export/import_export" require "import_export"
ids = args[:category_ids].split(" ") ids = args[:category_ids].split(" ")
ImportExport.export_categories(ids) ImportExport.export_categories(ids)
@ -11,7 +11,7 @@ end
desc 'Export only the structure of all categories' desc 'Export only the structure of all categories'
task 'export:category_structure', [:include_group_users, :file_name] => [:environment] do |_, args| task 'export:category_structure', [:include_group_users, :file_name] => [:environment] do |_, args|
require "import_export/import_export" require "import_export"
ImportExport.export_category_structure(args[:include_group_users], args[:file_name]) ImportExport.export_category_structure(args[:include_group_users], args[:file_name])
puts "", "Done", "" puts "", "Done", ""

2
lib/tasks/import.rake
View File

@ -507,7 +507,7 @@ end
desc 'Import existing exported file' desc 'Import existing exported file'
task 'import:file', [:file_name] => [:environment] do |_, args| task 'import:file', [:file_name] => [:environment] do |_, args|
require "import_export/import_export" require "import_export"
ImportExport.import(args[:file_name]) ImportExport.import(args[:file_name])
puts "", "Done", "" puts "", "Done", ""

2
script/discourse
View File

@ -264,7 +264,7 @@ class DiscourseCLI < Thor
end end
def load_import_export def load_import_export
require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export/import_export") require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export")
end end
def do_remap(from, to, regex = false) def do_remap(from, to, regex = false)