harrybomrah
/
personal-conference
forked from saurabh/personal-conference
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

joint to join

This commit is contained in:
Harry Bomrah 2016-04-06 12:53:45 +08:00
parent e2bb1ac700
commit b79a6d29c5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/personal_conferences_controller.rb
View File

@ -38,7 +38,7 @@ class PersonalConferencesController < ApplicationController
when "publication_date" when "publication_date"
t << {"value" => (writing_conference.send(fs).strftime("%Y/%m/%d") rescue "")} t << {"value" => (writing_conference.send(fs).strftime("%Y/%m/%d") rescue "")}
when "author_type" when "author_type"
t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.joint(", ") rescue "")} t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")}
else else
t << {"value" => writing_conference.send(fs)} t << {"value" => writing_conference.send(fs)}
end end

2
app/models/writing_conference.rb
View File

@ -118,7 +118,7 @@ class WritingConference
when "paper_levels" when "paper_levels"
pd_data << {"data_title" => ( !p.conference_paper_levels.blank? ? p.conference_paper_levels.collect{|x| x.title}.join(', ') : "")} pd_data << {"data_title" => ( !p.conference_paper_levels.blank? ? p.conference_paper_levels.collect{|x| x.title}.join(', ') : "")}
when "author_type" when "author_type"
pd_data << {"data_title" => (p.conference_author_types.collect{|cat| cat.title}.joint(", ") rescue "")} pd_data << {"data_title" => (p.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")}
else else
pd_data << { "data_title" => p.send(t) } pd_data << { "data_title" => p.send(t) }
end end