From f12cffbeb453224b7c0864d5af8c2b283abd3ede Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 1 Apr 2016 20:58:59 +0800 Subject: [PATCH] fix --- app/controllers/personal_conferences_controller.rb | 4 +++- app/models/writing_conference.rb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb index e75c9ec..be018f6 100644 --- a/app/controllers/personal_conferences_controller.rb +++ b/app/controllers/personal_conferences_controller.rb @@ -35,8 +35,10 @@ class PersonalConferencesController < ApplicationController t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} when "paper_types" t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} - when "publication_date" + when "publication_date" t << {"value" => (writing_conference.send(fs).strftime("%Y/%m/%d") rescue "")} + when "author_type" + t << {"value" => (writing_conference.conference_author_type.title rescue "")} else t << {"value" => writing_conference.send(fs)} end diff --git a/app/models/writing_conference.rb b/app/models/writing_conference.rb index 0e42d39..5e81dac 100644 --- a/app/models/writing_conference.rb +++ b/app/models/writing_conference.rb @@ -117,6 +117,8 @@ class WritingConference pd_data << {"data_title" => ( !p.conference_paper_types.blank? ? p.conference_paper_types.collect{|x| x.title}.join(', ') : "")} when "paper_levels" pd_data << {"data_title" => ( !p.conference_paper_levels.blank? ? p.conference_paper_levels.collect{|x| x.title}.join(', ') : "")} + when "author_type" + pd_data << {"data_title" => (p.conference_author_type.title rescue "")} else pd_data << { "data_title" => p.send(t) } end