diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 625538d..0b35fe1 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -33,45 +33,44 @@
|
<%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
|
- <% journals.each_with_index do |journal,i| %>
- <% if params['mode']=='simple' %>
+ <% if params['mode']=='simple' %>
+ <% journals.each_with_index do |journal,i| %>
<%= journal %>
|
- <% else %>
+ <% end %>
+ <% else %>
+ <% journals.each_with_index do |k,v,i| %>
<% j=0 %>
- <% puts ['helpme',journal] %>
- <% journal.each do |k,v| %>
- <% puts ['hello',j,k,v] %>
- <% len1 = v.length %>
-
- <%= k[0] %>
- |
-
- <%= k[1] %>
- |
-
- <%= k[2] %>
- |
-
- <%= k[3] %>
- |
- <% v.each_with_index do |journal_child,index1| %>
- <% len2 = v.length %>
-
- <%= journal_child %>
- |
- <% if len2!=(i+1) %>
-
-
- <% end %>
- <% end %>
- <% if len1!=(j+1) %>
-
-
- <% end %>
- <% j=j+1 %>
+ <% puts ['hello',j,k,v] %>
+ <% len1 = v.length %>
+ |
+ <%= k[0] %>
+ |
+
+ <%= k[1] %>
+ |
+
+ <%= k[2] %>
+ |
+
+ <%= k[3] %>
+ |
+ <% v.each_with_index do |journal_child,index1| %>
+ <% len2 = v.length %>
+
+ <%= journal_child %>
+ |
+ <% if len2!=(i+1) %>
+
+
+ <% end %>
<% end %>
+ <% if len1!=(j+1) %>
+
+
+ <% end %>
+ <% j=j+1 %>
<% end %>
<% if len!=(i+1) %>