alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import modified

This commit is contained in:
Harry Bomrah 2014-12-11 15:01:42 +08:00
parent b11299a667
commit adbbd044ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/import_controller.rb
View File

@ -72,7 +72,7 @@ class Admin::ImportController < OrbitAdminController
categories[id]['id'] = old_cate.id.to_s categories[id]['id'] = old_cate.id.to_s
end end
end end
render :json=>categories render :json=>categories.to_json
end end
def module_data_list def module_data_list
@ -82,7 +82,7 @@ class Admin::ImportController < OrbitAdminController
response = http.request(request) response = http.request(request)
data = response.body data = response.body
data = JSON.parse(data) data = JSON.parse(data)
render :json=>data render :json=>data.to_json
end end
def module_data def module_data
@ -99,7 +99,7 @@ class Admin::ImportController < OrbitAdminController
when 'announcement' when 'announcement'
import_announcement(data) import_announcement(data)
end end
render :json=>['status'=>'ok'] render :json=>['status'=>'ok'].to_json
end end
def import_archive(file) def import_archive(file)