From 420a302ee8e640c6b2f1b69c1a39a268e8e702db Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 14 May 2014 19:51:17 +0800 Subject: [PATCH] some changes for frontend parser --- app/controllers/announcements_controller.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index baa00e7..914e438 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -6,12 +6,15 @@ class AnnouncementsController < ApplicationController { "title" => a.title, "subtitle" => a.subtitle, + "postdate" => a.postdate.strftime("%b %d, %Y at %I:%M %p"), "link_to_show" => OrbitHelper.url_to_show(a.to_param), - "more" => "More", + "img_src" => a.image.thumb.url || "http://placehold.it/100x100", + "more" => "More" } end { - "data" => anns + "announcements" => anns, + "extras" => {"widget-title"=>"Announcements"} } end @@ -36,17 +39,17 @@ class AnnouncementsController < ApplicationController params = OrbitHelper.params announcement = Bulletin.can_display.find_by(:uid=>params[:uid]) - tags = announcement.tags.map{|tag| { "tag" => tag.name } } - files = announcement.bulletin_files.map{|file| { "file_url" => file.file.url, "file_title" => file.title } } - links = announcement.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => link.title } } - + tags = announcement.tags.map{|tag| { "tag" => tag.name } } rescue [] + files = announcement.bulletin_files.map{|file| { "file_url" => file.file.url, "file_title" => file.title } } rescue [] + links = announcement.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => link.title } } rescue [] + update_user = announcement.update_user.member_profile.name rescue "" { "tags" => tags, "bulletin_files" => files, "bulletin_links" => links, "data" => { "title" => announcement.title, - "update_user" => announcement.update_user.member_profile.name, + "update_user" => update_user, "updated_at" => announcement.updated_at.strftime('%Y-%m-%d %H:%M'), "body" =>announcement.text, "image" => announcement.image.url