From 4f480077b2f288e505df02efa236134ed4cdcc45 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 15 Feb 2016 19:06:48 +0800 Subject: [PATCH] small fix --- app/models/book.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/models/book.rb b/app/models/book.rb index 73986a4..732e60b 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -67,12 +67,23 @@ class Book "book_title" ] - pd_title = fields_to_show.collect do |t| - { - "plugin_data_title" => I18n.t("personal_book.#{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).or(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_book.#{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 = []