From 3a2bdeb8042db97b3fd802ed9a5b8d4b2e24950c Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 16 Jul 2014 17:35:36 +0800 Subject: [PATCH] fixed archive problem on orbit --- app/controllers/archives_controller.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb index d6d1226..5237d31 100644 --- a/app/controllers/archives_controller.rb +++ b/app/controllers/archives_controller.rb @@ -25,16 +25,19 @@ class ArchivesController < ApplicationController } end files = archive.archive_file_multiples.order_by(:sort_number=>'asc').collect do |file| - title = (file.file_title.blank? ? File.basename(file.file.path) : file.file_title) + title = (file.file_title.blank? ? File.basename(file.file.path) : file.file_title) rescue "" + extension = file.file.file.extension.downcase rescue "" + url = file.file.url rescue "" { - "file-name" => title || "", - "file-type" => file.file.file.extension.downcase || "", - "file-url" => file.file.url || "" + "file-name" => title, + "file-type" => extension, + "file-url" => url } end + { "archive-title" => archive.title || "", - "statuses" => statuses || [], + "statuses" => statuses, "files" => files } end @@ -43,6 +46,7 @@ class ArchivesController < ApplicationController "archives" => archives } end + { "categories" => cats }