diff --git a/app/helpers/admin/personal_conferences_helper.rb b/app/helpers/admin/personal_conferences_helper.rb index b0c1065..0462438 100644 --- a/app/helpers/admin/personal_conferences_helper.rb +++ b/app/helpers/admin/personal_conferences_helper.rb @@ -1,29 +1,44 @@ module Admin::PersonalConferencesHelper - def get_authors_text(writing_conference) + def get_authors_text(writing_conference) authors_text = Nokogiri::HTML(writing_conference.authors.to_s).text split_text = authors_text.match(/[、,,\/]/) split_text = split_text.nil? ? '/' : split_text[0] - full_authors_names = get_member(writing_conference).collect(&:name) if authors_text.present? - authors_names = authors_text.split(split_text).select{|a| !(full_authors_names.include?(a.strip()))} - full_authors_names += authors_names + authors_names = authors_text.split(split_text) + else + authors_names = [] end + full_authors_names = get_member(writing_conference).collect do |member| + member_name = member.name + idx = authors_names.index{|a| a.chomp('*') == member_name} + if idx + member_name = authors_names[idx] + authors_names[idx] = nil + end + member_name + end + full_authors_names += authors_names.compact full_authors_names.join(split_text) end def get_authors_show(writing_conference) authors_text = Nokogiri::HTML(writing_conference.authors.to_s).text split_text = authors_text.match(/[、,,\/]/) split_text = split_text.nil? ? '/' : split_text[0] - full_authors_names = [] - full_authors = get_member(writing_conference).collect{|member| - member_name = member.name - full_authors_names << member_name - "#{member_name}" - } if authors_text.present? - authors_names = authors_text.split(split_text).select{|a| !(full_authors_names.include?(a.strip()))} - full_authors += authors_names + authors_names = authors_text.split(split_text) + else + authors_names = [] end + full_authors = get_member(writing_conference).collect do |member| + member_name = member.name + idx = authors_names.index{|a| a.chomp('*') == member_name} + if idx + member_name = authors_names[idx] + authors_names[idx] = nil + end + "#{member_name}" + end + full_authors += authors_names.compact full_authors.join(split_text) end def get_member(writing_conference)