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

fix page url and add data for frontend

This commit is contained in:
Ruling-Mac 2015-10-21 15:52:22 +08:00
parent dcc2be7eae
commit 7f4f8285ab
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/digital_archives_controller.rb
View File

@ -46,11 +46,22 @@ class DigitalArchivesController < ApplicationController
{ {
"title" => (dca.title rescue ""), "title" => (dca.title rescue ""),
"item-date" => (dca.item_date rescue ""), "item-date" => (dca.item_date rescue ""),
"location" => (dca.location rescue ""),
"department" => (dca.department rescue ""),
"character" => (dca.character rescue ""),
"description" => (dca.description rescue ""),
"detail_description" => (dca.detail_description rescue ""),
"material" => (dca.material rescue ""),
"size" => (dca.size rescue ""),
"item_id" => (dca.item_id rescue ""),
"item_from" => (dca.item_from rescue ""),
"item_status" => (dca.item_status rescue ""),
"album_content" => (dca.album_content rescue ""),
"files" => dcafs "files" => dcafs
} }
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}"
{ {
"digital_content_archives" => dcas, "digital_content_archives" => dcas,
"extras" => { "extras" => {