From a3acdf67337e4cd591187dc6bd822ad0b67300ed Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 14:33:37 +0800
Subject: [PATCH] Update merge.html.erb

---
 app/views/admin/journal_papers/merge.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 4dfd876..f70f634 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -47,9 +47,9 @@
     <% i=0 %>
     <% journals.each do |k,v| %>
         <% len1 = v.length %>
-        <% k.each |keychild| %>
+        <% k.each do |keychild| %>
             <td rowspan="<%= len1 %>">
-              <%= keychild %>
+              <%= keychild.to_s.blank? ? t('personal_journal.no_input') : keychild  %>
             </td>
         <% end %>
         <% v.each_with_index do |journal_child,index1| %>