From dcc426749037f63788efce4e298324b609cd185a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 19 May 2015 12:40:35 +0200
Subject: [PATCH] FIX: base script import to handle category color/text color

---
 script/import_scripts/base.rb      | 4 +++-
 script/import_scripts/bbpress.rb   | 1 -
 script/import_scripts/bespoke_1.rb | 3 +--
 script/import_scripts/mybb.rb      | 1 -
 script/import_scripts/smf2.rb      | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 3b3a2b8dc5a..262786151fc 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -370,7 +370,9 @@ class ImportScripts::Base
       user_id: opts[:user_id] || opts[:user].try(:id) || -1,
       position: opts[:position],
       description: opts[:description],
-      parent_category_id: opts[:parent_category_id]
+      parent_category_id: opts[:parent_category_id],
+      color: opts[:color] || "AB9364",
+      text_color: opts[:text_color] || "FFF",
     )
 
     new_category.custom_fields["import_id"] = import_id if import_id
diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb
index 3ea8778cef1..066c9c23d5b 100644
--- a/script/import_scripts/bbpress.rb
+++ b/script/import_scripts/bbpress.rb
@@ -8,7 +8,6 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 BB_PRESS_DB = ENV['BBPRESS_DB'] || "bbpress"
 DB_TABLE_PREFIX = "wp_"
 
-
 class ImportScripts::Bbpress < ImportScripts::Base
 
   def initialize
diff --git a/script/import_scripts/bespoke_1.rb b/script/import_scripts/bespoke_1.rb
index 171b95b4a0f..5cd1744212a 100644
--- a/script/import_scripts/bespoke_1.rb
+++ b/script/import_scripts/bespoke_1.rb
@@ -1,6 +1,5 @@
 # bespoke importer for a customer, feel free to borrow ideas
-#
-#
+
 require 'csv'
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index 49a2f21fde6..c2337d56a14 100644
--- a/script/import_scripts/mybb.rb
+++ b/script/import_scripts/mybb.rb
@@ -1,5 +1,4 @@
 require "mysql2"
-
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 # Call it like this:
diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index c2b0ea08ceb..2ee607a2286 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -1,5 +1,4 @@
 require 'mysql2'
-
 require File.expand_path(File.dirname(__FILE__) + '/base.rb')
 
 require 'htmlentities'