comma
This commit is contained in:
parent
b5afc9e715
commit
76af4a53a2
|
@ -87,16 +87,6 @@ class DigitalArchivesController < ApplicationController
|
||||||
params = OrbitHelper.params
|
params = OrbitHelper.params
|
||||||
dca = DigitalContentArchive.find_by_param(params[:uid])
|
dca = DigitalContentArchive.find_by_param(params[:uid])
|
||||||
|
|
||||||
dcafs = dca.digital_content_archive_files.collect do |file|
|
|
||||||
if file.choose_lang.include?(I18n.locale.to_s)
|
|
||||||
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
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
page = Page.where(:page_id => params[:page_id]).first rescue nil
|
page = Page.where(:page_id => params[:page_id]).first rescue nil
|
||||||
url = page.nil? ? "#" : "/#{I18n.locale.to_s}#{page.url}"
|
url = page.nil? ? "#" : "/#{I18n.locale.to_s}#{page.url}"
|
||||||
|
|
||||||
|
@ -114,7 +104,6 @@ class DigitalArchivesController < ApplicationController
|
||||||
"item-from" => (dca.item_from rescue ""),
|
"item-from" => (dca.item_from rescue ""),
|
||||||
"item-status" => (dca.item_status rescue ""),
|
"item-status" => (dca.item_status rescue ""),
|
||||||
"album-content" => (dca.album_content rescue ""),
|
"album-content" => (dca.album_content rescue ""),
|
||||||
"files" => dcafs
|
|
||||||
"th_title" => t('title'),
|
"th_title" => t('title'),
|
||||||
"th_location" => t("digital_archive.location"),
|
"th_location" => t("digital_archive.location"),
|
||||||
"th_department" => t('digital_archive.department'),
|
"th_department" => t('digital_archive.department'),
|
||||||
|
|
Loading…
Reference in New Issue