From 485f9b54014f6b538cb3adefca149dd760a6267d Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 13 Jan 2016 17:54:54 +0800 Subject: [PATCH] fix for column removal --- app/models/honor.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/honor.rb b/app/models/honor.rb index c38fc79..6ba6517 100644 --- a/app/models/honor.rb +++ b/app/models/honor.rb @@ -52,7 +52,11 @@ class Honor pd_title = [] fields_to_show.each do |t| - fields_to_remove << t if (datas.where(t.to_sym.ne => nil, t.to_sym.ne => "").count == 0 rescue false) + if (self.fields[t].type == String || self.fields[t].type == Object rescue false) + fields_to_remove << t if (datas.where(t.to_sym.ne => nil, t.to_sym.ne => "").count == 0 rescue false) + else + fields_to_remove << t if (datas.where(t.to_sym.ne => nil).count == 0 rescue false) + end pd_title << { "plugin_data_title" => I18n.t("personal_honor.#{t}") } if !fields_to_remove.include?(t)