Redmine

          raise ActiveRecord::StaleObjectError

    @latest_journal = @journals.last

    if params[:conflict_resolution].present?

      case params[:conflict_resolution]

      when 'none'

        redirect_to :controller => 'issues', :action => 'show', :id => @issue

        return

      when 'notes'

        # update notes only

        params.delete(:attachments)

        params.delete(:issue)

        params.delete(:time_entry)

      when 'all'

        ;

      end

    end

    begin

      if @issue.save_issue_with_child_records(params, @time_entry)

        render_attachment_warning_if_needed(@issue)

        flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?

        respond_to do |format|

          format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }

          format.api  { head :ok }

        end

      else

        render_attachment_warning_if_needed(@issue)

        flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?

        @journal = @issue.current_journal

        respond_to do |format|

          format.html { render :action => 'edit' }

          format.api  { render_validation_errors(@issue) }

        end

    rescue ActiveRecord::StaleObjectError

      # mid-air conflict

      @conflict_detected = true

      @issue.reload

      params[:issue].delete(:lock_version) if params[:issue]

      update_issue_from_params

      @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")

      @journals.each_with_index {|j,i| j.indice = i+1}

      @latest_journal = @journals.last

      if params[:latest_journal].present?

        latest_journal_id = params[:latest_journal].to_i

        @journals = @journals.select{|journal| latest_journal_id < journal.id }

      end

      @journals.reverse! if User.current.wants_comments_in_reverse_order?

        format.html { render :action => 'conflict' }

    <% if @conflict_detected %>

        <fieldset><legend><%= l(:label_conflict_resolution) %></legend>

            <label>

                <%= radio_button_tag 'conflict_resolution', 'none' %>

                <%= l(:label_conflict_resolution_none,

                      :id => (link_to "##{@issue.id}", :controller => 'issues', :action => 'show', :id => @issue)) %>

            </label>

            <br />

            <% if @notes.present? %>

            <label><%= radio_button_tag 'conflict_resolution', 'notes', true %> <%= l(:label_conflict_resolution_notes) %></label>

            <br />

            <% end %>

            <label><%= radio_button_tag 'conflict_resolution', 'all', @notes.blank? %> <%= l(:label_conflict_resolution_all) %></label>

        </fieldset>

    <% end %>

    <% if @latest_journal %>

        <%= hidden_field_tag 'latest_journal', @latest_journal.id %>

    <% end %>

        <fieldset class="tabular conflict_resolution_all"><legend><%= l(:label_change_properties) %></legend>

        <fieldset class="tabular conflict_resolution_all"><legend><%= l(:button_log_time) %></legend>

    <fieldset class="conflict_resolution_all conflict_resolution_notes"><legend><%= l(:field_notes) %></legend>

    <p class="conflict_resolution_all"><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p>

    <%= submit_tag l(:button_submit), :class => 'conflict_resolution_notes conflict_resolution_all' %>

    <% if @conflict_detected %>

       <%= submit_tag l(:button_conflict_resolution_none, :id => "##{@issue.id}"), :class => 'conflict_resolution_none' %>

    <% end %>

                       }, :accesskey => accesskey(:preview), :class => 'conflict_resolution_notes conflict_resolution_all' %>

<div id="preview" class="wiki conflict_resolution_notes conflict_resolution_all"></div>

<% if @conflict_detected %>

  <%= javascript_tag 'setupShowHideByRadio("conflict_resolution_", [ "none", "notes", "all" ])' %>

<% end %>

<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>

<% if @journals.present? %>

<div id="history">

<h3><%=l(:label_conflict_history)%></h3>

<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>

</div>

<% end %>

<%= render :partial => 'edit' %>

<% content_for :header_tags do %>

    <%= robot_exclusion_tag %>

<% end %>

/*

 * Setup observers of radio buttons to show/hide associated elements

 * automatically.

 *

 * id_base:

 *   A base name of radio button ids to observe.

 * id_suffixes:

 *   An array of radio button id suffixes to observe.

 *   id_base + id_suffixes[i] is an id.

 * css_class_base:

 *   A base name of css classes to show/hide.

 *   css_class_base + css_class_suffixes[i] is a class.

 *   When a radio button is clicked,

 *   its corresponding css class is shown, and the others are hidden.

 *   This parameter is an option, and defaults to id_base.

 * css_class_suffixes:

 *   An array of css class suffixes to show/hide.

 *   This parameter is an option, and defaults to id_suffixes.

 */

function setupShowHideByRadio(

  id_base, id_suffixes, css_class_base, css_class_suffixes) {

  if (css_class_base === undefined) {

    css_class_base = id_base;

  }

  if (css_class_suffixes === undefined) {

    css_class_suffixes = id_suffixes;

  }

  function f() {

    /* find a checked radio button */

    selected_index = -1;

    id_suffixes.each(function(id_suffix, index){

      radio = $(id_base + id_suffix);

      if (radio && radio.checked) {

        selected_index = index;

        throw $break;

      }

    });

    /* hide unselected */

    css_class_suffixes.each(function(css_class_suffix, index){

      if (index != selected_index) {

        $$('.' + css_class_base + css_class_suffix).each(

          function(ele) { ele.hide(); });

      }

    })

    /* show selected */

    if (0 <= selected_index) {

      $$('.' + css_class_base + css_class_suffixes[selected_index]).each(

        function(ele) { ele.show(); });

    }

  }

  /* observe radio buttons */

  id_suffixes.each(function(id_suffix, index){

    radio = $(id_base + id_suffix)

    if (radio) {

      Event.observe(radio, 'change', f);

    }

  })

  f();

}

    assert_put_update_stale_issue('')

    assert_no_tag :tag => 'input', :attributes => { :id => 'conflict_resolution_notes' }

    assert_tag :tag => 'input', :attributes => { :id => 'conflict_resolution_all', :checked => 'checked' }

  end

  def test_put_update_stale_issue_with_notes

    assert_put_update_stale_issue('test notes')

    assert_tag :tag => 'input', :attributes => { :id => 'conflict_resolution_notes', :checked => 'checked' }

    assert_tag :tag => 'input', :attributes => { :id => 'conflict_resolution_all' }

  end

  def assert_put_update_stale_issue(notes)

                :notes => notes,

    assert_template 'conflict'

    assert_tag :tag => 'input', :attributes => { :id => 'issue_lock_version', :value => issue.lock_version }

    assert_tag :tag => 'legend', :content => I18n.t(:label_conflict_resolution)

    journals = issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")

    assert_tag :tag => 'input', :attributes => { :id => 'latest_journal', :value => journals.last.id }

    journals.each{|journal|

      assert_tag :tag => 'div', :attributes => { :id => "change-#{journal.id}" }

    }

  end

  def test_conflict_resolution_none

    issue = Issue.find(2)

    @request.session[:user_id] = 2

    assert_no_difference 'Journal.count' do

      assert_no_difference 'TimeEntry.count' do

        assert_no_difference 'Attachment.count' do

          put_conflict_resolution(issue, 'none')

        end

      end

    end

  end

  def test_conflict_resolution_notes

    issue = Issue.find(2)

    @request.session[:user_id] = 2

    prev_status = issue.status

    assert_difference 'Journal.count' do

      assert_no_difference 'TimeEntry.count' do

        assert_no_difference 'Attachment.count' do

          put_conflict_resolution(issue, 'notes')

        end

      end

    end

    issue.reload

    assert_equal prev_status, issue.status

  end

  def test_conflict_resolution_all

    issue = Issue.find(2)

    @request.session[:user_id] = 2

    prev_status = issue.status

    assert_difference 'Journal.count' do

      assert_difference 'TimeEntry.count' do

        assert_difference 'Attachment.count' do

          put_conflict_resolution(issue, 'all')

        end

      end

    end

    issue.reload

    assert_not_equal prev_status, issue.status

  end

  def put_conflict_resolution(issue, conflict_resolution)

    set_tmp_attachments_directory

    put :update,

        :id => issue.id,

        :issue => {

            :status_id => 3,

            :fixed_version_id => 4,

            :lock_version => issue.lock_version,

        },

        :notes => 'test notes',

        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}},

        :time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id },

        :conflict_resolution => conflict_resolution

    assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id

  label_conflict_resolution: Conflict Resolution

  label_conflict_resolution_none: "Throw away my changes, and show %{id}"

  label_conflict_resolution_notes: Submit only my new notes

  label_conflict_resolution_all: Edit again

  label_conflict_history: Another user's updates

  button_conflict_resolution_none: "Show %{id}"

  label_conflict_resolution: 自分の更新データの反映方法

  label_conflict_resolution_none: "自分の更新データを <strong>破棄</strong> し %{id} を表示する"

  label_conflict_resolution_notes: 自分の <strong>注記のみ</strong> を反映する

  label_conflict_resolution_all: 自分の更新データを修正する

  label_conflict_history: 別のユーザによる更新内容

  button_conflict_resolution_none: "%{id} を表示"