From 2104996144d75de8794a6f6357eccd5d29eb5788 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 17:01:14 +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 4cdebe3..613204e 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -36,7 +36,7 @@
   <% if params['mode']=='simple' %>
     <% journals.each_with_index do |journal,i| %>
         <td>
-          <a href="<%= edit_admin_journal_paper_path(writing_journal) %>" target="_blank">
+          <a href="<%= edit_admin_journal_paper_path(journal) %>" target="_blank">
             <%= get_member(journal).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>
           </a>
         </td>
@@ -56,7 +56,7 @@
         <% end %>
         <% v.each_with_index do |journal_child,index1| %>
           <td>
-            <a href="<%= edit_admin_journal_paper_path(writing_journal) %>" target="_blank">
+            <a href="<%= edit_admin_journal_paper_path(journal) %>" target="_blank">
               <%= get_member(journal_child).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>
             </a>
           </td>