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('/') %> <% if params['mode']=='simple' %> + + + <% journals.each_with_index do |journal,i| %> - - - <%= 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 %> <% end %> + + + <% v.each_with_index do |journal_child,index1| %> - - - <%= get_member(journal_child).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>