diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index 5bbc1fc..3132cfb 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -14,8 +14,12 @@ class AnnouncementsController < ApplicationController "status-class" => "status-#{status['classname']}" } end + files = a.bulletin_files.map{|file| { "file_url" => file.file.url, "file_title" => (file.title.blank? ? File.basename(file.file.path) : file.title rescue '') } } rescue [] + links = a.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue [] author = User.find(a.create_user_id).member_profile.name rescue "" { + "bulletin_links" => links, + "bulletin_files" => files, "title" => a.title, "subtitle" => a.subtitle, "statuses" => statuses, @@ -56,8 +60,12 @@ class AnnouncementsController < ApplicationController "status-class" => "status-#{status['classname']}" } end + files = a.bulletin_files.map{|file| { "file_url" => file.file.url, "file_title" => (file.title.blank? ? File.basename(file.file.path) : file.title rescue '') } } rescue [] + links = a.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue [] author = User.find(a.create_user_id).member_profile.name rescue "" { + "bulletin_links" => links, + "bulletin_files" => files, "title" => a.title, "subtitle" => a.subtitle, "statuses" => statuses,