From adbbd044ef6d1e4f2a207fbbb4228f2067a4cc33 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Thu, 11 Dec 2014 15:01:42 +0800
Subject: [PATCH] import modified

---
 app/controllers/admin/import_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb
index 2f963d8..e427eca 100644
--- a/app/controllers/admin/import_controller.rb
+++ b/app/controllers/admin/import_controller.rb
@@ -72,7 +72,7 @@ class Admin::ImportController < OrbitAdminController
         categories[id]['id'] = old_cate.id.to_s
       end
     end
-    render :json=>categories
+    render :json=>categories.to_json
   end
 
   def module_data_list
@@ -82,7 +82,7 @@ class Admin::ImportController < OrbitAdminController
     response = http.request(request)
     data = response.body
     data = JSON.parse(data)
-    render :json=>data
+    render :json=>data.to_json
   end
 
   def module_data
@@ -99,7 +99,7 @@ class Admin::ImportController < OrbitAdminController
     when 'announcement'
       import_announcement(data)
     end
-    render :json=>['status'=>'ok']
+    render :json=>['status'=>'ok'].to_json
   end
 
   def import_archive(file)