From f4a907b771c5ccdb0c1ee8eab4e8de86934c5be2 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 1 Apr 2016 21:04:17 +0800 Subject: [PATCH] fix --- app/controllers/personal_journals_controller.rb | 2 ++ app/models/journal_paper.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb index 4a0a6b6..c20c67b 100644 --- a/app/controllers/personal_journals_controller.rb +++ b/app/controllers/personal_journals_controller.rb @@ -35,6 +35,8 @@ class PersonalJournalsController < ApplicationController t << {"value" => ( !journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect{|x| x.title}.join(', ')})" : nil)} when "publication_date" t << {"value" => (journal_paper.send(fs).strftime("%Y/%m/%d") rescue "")} + when "author_type" + t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| title}.join(", ") rescue "")} else t << {"value" => journal_paper.send(fs)} end diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb index b223334..6b06dd6 100644 --- a/app/models/journal_paper.rb +++ b/app/models/journal_paper.rb @@ -122,6 +122,8 @@ class JournalPaper pd_data << {"data_title" => ( !p.journal_levels.blank? ? "(#{p.journal_levels.collect{|x| x.title}.join(', ')})" : nil)} when "publication_date" pd_data << {"data_title" => (p.send(t).strftime("%Y/%m/%d") rescue "")} + when "author_type" + pd_data << {"data_title" => (p.journal_paper_author_types.collect{|jat| title}.join(", ") rescue "")} else pd_data << {"data_title" => p.send(t)} end