Update merge.html.erb
This commit is contained in:
parent
08251b5615
commit
7b8f71305c
|
@ -36,9 +36,7 @@
|
||||||
<% if params['mode']=='simple' %>
|
<% if params['mode']=='simple' %>
|
||||||
<% journals.each_with_index do |journal,i| %>
|
<% journals.each_with_index do |journal,i| %>
|
||||||
<td>
|
<td>
|
||||||
<% get_member(journal).each do |member| %>
|
<%= get_member(journal).collect(&:name).join(', ') rescue t('personal_journal.no_input') %>
|
||||||
<%= member.name rescue t('personal_journal.no_input') %>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
</td>
|
||||||
<% if len!=(i+1) %>
|
<% if len!=(i+1) %>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -56,9 +54,7 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
<% v.each_with_index do |journal_child,index1| %>
|
<% v.each_with_index do |journal_child,index1| %>
|
||||||
<td>
|
<td>
|
||||||
<% get_member(journal_child).each do |member| %>
|
<%= get_member(journal_child).collect(&:name).join(', ') rescue t('personal_journal.no_input') %>
|
||||||
<%= member.name rescue t('personal_journal.no_input') %>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
</td>
|
||||||
<% if len1!=index1 %>
|
<% if len1!=index1 %>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue