show page

This commit is contained in:
Ruling-Mac 2015-10-21 19:19:58 +08:00
parent 8e8a01315f
commit 16343a03be
1 changed files with 3 additions and 5 deletions

View File

@ -97,9 +97,9 @@ class DigitalArchivesController < ApplicationController
} }
end end
end end
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 = { 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,7 +114,7 @@ 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 = dcas =
{ {
"digital_content_archives" => dca, "digital_content_archives" => dca,
@ -133,7 +133,5 @@ class DigitalArchivesController < ApplicationController
"th_item_status" => t('digital_archive.item_status') "th_item_status" => t('digital_archive.item_status')
} }
} }
end end
end end