alex
/
digital-archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show

This commit is contained in:
Ruling-Mac 2015-10-21 19:29:47 +08:00
parent 16343a03be
commit b5afc9e715
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/digital_archives_controller.rb
View File

@ -99,7 +99,8 @@ class DigitalArchivesController < ApplicationController
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}"
dca = [{
{
"title" => (dca.title rescue ""), "title" => (dca.title rescue ""),
"item-date" => (dca.item_date rescue ""), "item-date" => (dca.item_date rescue ""),
"location" => (dca.location rescue ""), "location" => (dca.location rescue ""),
@ -114,11 +115,6 @@ class DigitalArchivesController < ApplicationController
"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 "files" => dcafs
}]
dcas =
{
"digital_content_archives" => dca,
"extras" => {
"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'),
@ -131,7 +127,7 @@ class DigitalArchivesController < ApplicationController
"th_item_id" => t('digital_archive.item_id'), "th_item_id" => t('digital_archive.item_id'),
"th_item_from" => t('digital_archive.item_from'), "th_item_from" => t('digital_archive.item_from'),
"th_item_status" => t('digital_archive.item_status') "th_item_status" => t('digital_archive.item_status')
}
} }
end end
end end