From d257e273a39f82d48abf6c0a26facd1c8218cfb2 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 3 Oct 2014 14:17:06 +0800 Subject: [PATCH] fix for frontend --- app/controllers/personal_researches_controller.rb | 2 +- app/models/research.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/personal_researches_controller.rb b/app/controllers/personal_researches_controller.rb index bc9ea17..22ad2e8 100644 --- a/app/controllers/personal_researches_controller.rb +++ b/app/controllers/personal_researches_controller.rb @@ -3,7 +3,7 @@ class PersonalResearchesController < ApplicationController researchs = Research.where(:is_hidden=>false).order_by(:year=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) research_list = researchs.collect do |research| { - "member" => research.member_profile.name, + "member" => (research.member_profile.name rescue ""), "year" => research.year, "publication_date" => (research.publish_date.strftime("%Y.%m") rescue ""), "research_title" => research.research_title, diff --git a/app/models/research.rb b/app/models/research.rb index 1a0f1e4..a14063d 100644 --- a/app/models/research.rb +++ b/app/models/research.rb @@ -31,7 +31,7 @@ class Research def get_plugin_data(fields_to_show) plugin_datas = [] fields_to_show.each do |field| - plugin_data = self.get_plugin_field_data(field) + plugin_data = self.get_plugin_field_data(field) rescue nil next if plugin_data.blank? or plugin_data['value'].blank? plugin_datas << plugin_data end