diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb index d852c1f..7fa1a15 100644 --- a/app/views/admin/journal_papers/merge.html.erb +++ b/app/views/admin/journal_papers/merge.html.erb @@ -15,7 +15,7 @@ <%= t('personal_journal.paper_type') %> <%= t('personal_journal.publication_date') %> <% end %> -<%= t("personal_journal.authors") %> +<%= t("personal_plugins.author") %> @@ -36,7 +36,9 @@ <% if params['mode']=='simple' %> <% journals.each_with_index do |journal,i| %> - <%= get_member(journal) %> + <% get_member(journal).each do |member| %> + <%= member.name rescue t('personal_journal.no_input') %> + <% end %> <% if len!=(i+1) %> @@ -54,7 +56,9 @@ <% end %> <% v.each_with_index do |journal_child,index1| %> - <%= get_member(journal_child) %> + <% get_member(journal).each do |member| %> + <%= member.name rescue t('personal_journal.no_input') %> + <% end %> <% if len1!=index1 %>