_conflict.html.erb
26 lines
| 1.1 KiB
| text/plain
|
TextLexer
Jean-Philippe Lang
|
r8654 | <div class="conflict"> | ||
Toshi MARUYAMA
|
r8671 | <%= l(:notice_issue_update_conflict) %> | ||
|
Jean-Philippe Lang
|
r8654 | <% if @conflict_journals.present? %> | ||
|
Toshi MARUYAMA
|
r8671 | <div class="conflict-details"> | ||
|
Jean-Philippe Lang
|
r8654 | <% @conflict_journals.sort_by(&:id).each do |journal| %> | ||
|
Toshi MARUYAMA
|
r8671 | <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> | ||
| <% if journal.details.any? %> | ||||
| <ul class="details"> | ||||
| <% details_to_strings(journal.details).each do |string| %> | ||||
| <li><%= string %></li> | ||||
| <% end %> | ||||
| </ul> | ||||
| <% end %> | ||||
| <%= textilizable(journal, :notes) unless journal.notes.blank? %> | ||||
|
Jean-Philippe Lang
|
r8654 | <% end %> | ||
|
Toshi MARUYAMA
|
r8671 | </div> | ||
|
Jean-Philippe Lang
|
r8654 | <% end %> | ||
| </div> | ||||
| <p> | ||||
| <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br /> | ||||
|
Jean-Philippe Lang
|
r10336 | <% if @issue.notes.present? %> | ||
|
Jean-Philippe Lang
|
r8654 | <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> | ||
| <% end %> | ||||
|
Jean-Philippe Lang
|
r9742 | <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label> | ||
|
Jean-Philippe Lang
|
r8654 | </p> | ||
| <p><%= submit_tag l(:button_submit) %></p> | ||||