To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.

Statistics Download as Zip
| Branch: | Tag: | Revision:

root / .svn / pristine / 31 / 319ace742da33939c6f0a3745726645fe20c4534.svn-base @ 1297:0a574315af3e

History | View | Annotate | Download (1.14 KB)

1 1296:038ba2d95de8 Chris 
<div class="conflict">
2 
  <%= l(:notice_issue_update_conflict) %>
3 
  <% if @conflict_journals.present? %>
4 
    <div class="conflict-details">
5 
    <% @conflict_journals.sort_by(&:id).each do |journal| %>
6 
      <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
7 
      <% if journal.details.any? %>
8 
      <ul class="details">
9 
        <% details_to_strings(journal.details).each do |string| %>
10 
         <li><%= string %></li>
11 
        <% end %>
12 
      </ul>
13 
      <% end %>
14 
      <%= textilizable(journal, :notes) unless journal.notes.blank? %>
15 
    <% end %>
16 
    </div>
17 
  <% end %>
18 
</div>
19 
<p>
20 
  <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br />
21 
  <% if @issue.notes.present? %>
22 
  <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
23 
  <% end %>
24 
  <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label>
25 
</p>
26 
<p><%= submit_tag l(:button_submit) %></p>