From e2bb1ac7004525f5451cec60a5d954cfd9f627b1 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 6 Apr 2016 02:00:01 +0800
Subject: [PATCH] fix author order

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 app/models/writing_conference.rb                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index be018f6..e67ad96 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -38,7 +38,7 @@ class PersonalConferencesController < ApplicationController
         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 "")}
+          t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.joint(", ") rescue "")}
         else
           t << {"value" => writing_conference.send(fs)}
         end
diff --git a/app/models/writing_conference.rb b/app/models/writing_conference.rb
index 5e81dac..6906f50 100644
--- a/app/models/writing_conference.rb
+++ b/app/models/writing_conference.rb
@@ -118,7 +118,7 @@ class WritingConference
             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 "")}
+              pd_data << {"data_title" => (p.conference_author_types.collect{|cat| cat.title}.joint(", ") rescue "")}
             else
               pd_data << { "data_title" => p.send(t) }
           end