From 97ad18a1476a1050c223fc732d3dd4e7427235c5 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 17:31:44 +0800
Subject: [PATCH] Update merge.html.erb

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

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 5d506ae..4364333 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -35,10 +35,10 @@
     <%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
   </td>
   <% if params['mode']=='simple' %>
+    <td rowspan="<%= len %>">
+      <input type="checkbox" class="checkbox" name="journal_id" value="<%= journals.collect(&:id).join('/') %>">
+    </td>
     <% journals.each_with_index do |journal,i| %>
-        <td>
-          <input type="checkbox" class="checkbox" name="journal_id" value="<%= journal.id %>">
-        </td>
         <td>
           <a href="<%= edit_admin_journal_paper_path(journal) %>" target="_blank">
             <%= get_member(journal).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>
@@ -58,10 +58,10 @@
               <%= keychild.to_s.blank? ? t('personal_journal.no_input') : keychild  %>
             </td>
         <% end %>
+        <td rowspan="<%= len1 %>">
+            <input type="checkbox" class="checkbox" name="journal_id" value="<%= v.collect(&:id).join('/') %>">
+        </td>
         <% v.each_with_index do |journal_child,index1| %>
-          <td>
-            <input type="checkbox" class="checkbox" name="journal_id" value="<%= journal_child.id %>">
-          </td>
           <td>
             <a href="<%= edit_admin_journal_paper_path(journal_child) %>" target="_blank">
               <%= get_member(journal_child).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>