From 5a3f50bc77841559d8322a58f7d3b092dfc1bf67 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 15 Feb 2016 18:24:01 +0800 Subject: [PATCH] fix for empty columns --- app/models/patent.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/models/patent.rb b/app/models/patent.rb index c13a01f..3e3a2c9 100644 --- a/app/models/patent.rb +++ b/app/models/patent.rb @@ -51,12 +51,23 @@ class Patent "authors" ] - pd_title = fields_to_show.collect do |t| - { - "plugin_data_title" => I18n.t("personal_patent.#{t}") - } + fields_to_remove = [] + + pd_title = [] + + fields_to_show.each do |t| + if (self.fields[t].type.to_s == "String" 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_project.#{t}") + } if !fields_to_remove.include?(t) end + fields_to_show = fields_to_show - fields_to_remove + plugin_datas = datas.sort_for_frontend.collect do |p| pd_data = []