Update merge.html.erb

This commit is contained in:
chiu 2019-11-01 17:31:44 +08:00
parent de7c9c9104
commit 97ad18a147
1 changed files with 6 additions and 6 deletions

View File

@ -35,10 +35,10 @@
<%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %> <%= key[1].values.map{|v| v=="" ? t('personal_journal.no_input') : v}.join('/') %>
</td> </td>
<% if params['mode']=='simple' %> <% if params['mode']=='simple' %>
<% journals.each_with_index do |journal,i| %> <td rowspan="<%= len %>">
<td> <input type="checkbox" class="checkbox" name="journal_id" value="<%= journals.collect(&:id).join('/') %>">
<input type="checkbox" class="checkbox" name="journal_id" value="<%= journal.id %>">
</td> </td>
<% journals.each_with_index do |journal,i| %>
<td> <td>
<a href="<%= edit_admin_journal_paper_path(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') %> <%= 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 %> <%= keychild.to_s.blank? ? t('personal_journal.no_input') : keychild %>
</td> </td>
<% end %> <% end %>
<% v.each_with_index do |journal_child,index1| %> <td rowspan="<%= len1 %>">
<td> <input type="checkbox" class="checkbox" name="journal_id" value="<%= v.collect(&:id).join('/') %>">
<input type="checkbox" class="checkbox" name="journal_id" value="<%= journal_child.id %>">
</td> </td>
<% v.each_with_index do |journal_child,index1| %>
<td> <td>
<a href="<%= edit_admin_journal_paper_path(journal_child) %>" target="_blank"> <a href="<%= edit_admin_journal_paper_path(journal_child) %>" target="_blank">
<%= get_member(journal_child).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %> <%= get_member(journal_child).collect(&:name).join(' / ') rescue t('personal_journal.no_input') %>