From ac5f30d51ab6f41a4fd98dab8a538b74a1ec5c2f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 3 Oct 2014 14:13:29 +0800 Subject: [PATCH] fix for frontend --- app/controllers/personal_labs_controller.rb | 2 +- app/models/lab.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/personal_labs_controller.rb b/app/controllers/personal_labs_controller.rb index ba8ff86..13a2140 100644 --- a/app/controllers/personal_labs_controller.rb +++ b/app/controllers/personal_labs_controller.rb @@ -6,7 +6,7 @@ class PersonalLabsController < ApplicationController "year" => lab.year, "lab_title" => lab.lab_title, "location" => lab.location, - "member" => lab.member_profile.name, + "member" => (lab.member_profile.name rescue ""), "link_to_show" => OrbitHelper.url_to_show(lab.to_param) } end diff --git a/app/models/lab.rb b/app/models/lab.rb index afa4209..51eebdd 100644 --- a/app/models/lab.rb +++ b/app/models/lab.rb @@ -32,7 +32,7 @@ class Lab 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