Better handling of issue update conflicts (#8691).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/issues/_conflict.html.erb

@@ -0,0 +1,26 @@
+<div class="conflict">
+	<%= l(:notice_issue_update_conflict) %> 
+  <% if @conflict_journals.present? %>
+	  <div class="conflict-details">
+    <% @conflict_journals.sort_by(&:id).each do |journal| %>
+		  <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? %>
+    <% end %>
+		</div>
+  <% end %>
+</div>
+<p>
+  <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br />
+  <% if @notes.present? %>
+  <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
+  <% end %>
+	<label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
+</p>
+<p><%= submit_tag l(:button_submit) %></p>

app/views/issues/_edit.html.erb

@@ -1,5 +1,6 @@
 <% labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
+		<%= render :partial => 'conflict' if @conflict %>
     <div class="box">
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
@@ -35,6 +36,7 @@
     </div>
 
     <%= f.hidden_field :lock_version %>
+    <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
     <%= submit_tag l(:button_submit) %>
     <%= link_to_remote l(:label_preview),
                        { :url => preview_issue_path(:project_id => @project, :id => @issue),