From 6c151f981f16bde01b7a9d9db7253f75903346b9 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 11 Jan 2016 20:35:44 +0800 Subject: [PATCH] fix for frontend --- app/helpers/admin/journal_papers_helper.rb | 2 +- app/models/journal_paper.rb | 33 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/app/helpers/admin/journal_papers_helper.rb b/app/helpers/admin/journal_papers_helper.rb index 1c33eb6..bbb2135 100644 --- a/app/helpers/admin/journal_papers_helper.rb +++ b/app/helpers/admin/journal_papers_helper.rb @@ -87,7 +87,7 @@ module Admin::JournalPapersHelper end when 14 jpts = JournalPaperType.asc(:created_at).all.to_a - jp.journal_paper_type = jpts[val.to_i] if val.is_i? && val.to_s.to_i < jpts.count + jp.journal_paper_type = jpts[val.to_i] if val.to_s.is_i? && val.to_i < jpts.count when 15 jpas = JournalPaperAuthorType.asc(:created_at).all.to_a ts = val.to_s.split(",") diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb index 74cd7be..7e35172 100644 --- a/app/models/journal_paper.rb +++ b/app/models/journal_paper.rb @@ -64,11 +64,42 @@ class JournalPaper # pd = self.publication_date.strftime("%Y-%m-%d").split('-') # title << pd[0] # end - title << self.year + # title << self.year title.delete(nil) title.join(', ').gsub(', ,',',') end + def self.get_plugin_datas_to_member(datas) + fields_to_show = [ + "year", + "paper_title" + ] + + pd_title = fields_to_show.collect do |t| + { + "plugin_data_title" => I18n.t("personal_journal.#{t}") + } + end + + plugin_datas = datas.sort_for_frontend.collect do |p| + + pd_data = [] + fields_to_show.collect do |t| + if t == "paper_title" + pd_data << { "data_title" => "#{p.create_link}" } + else + pd_data << { "data_title" => p.send(t) } + end + end + + { + "pd_datas" => pd_data + } + + end + return [pd_title,plugin_datas] + end + # def self.member_data # members = MemberProfile.all # member_data = []