From db31f5e160f226db6e48cf3ef00d191516a664a1 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 12 Jan 2016 20:32:01 +0800 Subject: [PATCH] removed blank columns --- app/models/project.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 16047d8..5031f77 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -52,12 +52,19 @@ class Project "unit" ] - pd_title = fields_to_show.collect do |t| - { - "plugin_data_title" => I18n.t("personal_project.#{t}") - } + fields_to_remove = [] + + 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) + 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.with_index do |p,index| pd_data = []