From 284bf34fec9da1b41a116913d18fb037af307726 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 8 Jan 2013 11:01:23 +0800 Subject: [PATCH] amend file value to correct format --- app/controllers/desktop_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 4eef26be..bb3e12dc 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -117,8 +117,8 @@ class DesktopController< ApplicationController widge = DesktopWidget.find(tile.desktop_widget_id.to_s) # data_content = widge.widget_layout.file data_content = "/desktop/widget_layout?id="+tile.desktop_widget_id.to_s - jsfile = widge.javascripts.collect{|js| js.file} - cssfile = widge.css_default.file + jsfile = widge.javascripts.collect{|js| js.file.as_json[:file]} + cssfile = widge.css_default.file.as_json[:file] shape = widge.shape title = widge.name else @@ -212,4 +212,4 @@ class DesktopController< ApplicationController render :xml=>feed end -end \ No newline at end of file +end