Update merge.html.erb

2019-11-01 14:33:37 +08:00 · 2019-11-01 14:33:37 +08:00 · a3acdf6733
parent 9b117a71f4
commit a3acdf6733
1 changed files with 2 additions and 2 deletions
--- 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| %>