app/controllers/agents_controller.rb

@@ -122,13 +122,7 @@ class AgentsController < ApplicationController

                     @agent = current_user.agents.find(params[:id])
              

                 
              

                     respond_to do |format|
              

                -      if @agent.with_transaction_returning_status {
              

                -          @agent.attributes = params[:agent]
              

                -          if params[:drop_pending_events] && @agent.can_receive_events?
              

                -            @agent.set_last_checked_event_id
              

                -          end
              

                -          @agent.save
              

                -        }
              

                +      if @agent.update_attributes(params[:agent])
              

                         format.html { redirect_back "'#{@agent.name}' was successfully updated." }
              

                         format.json { render json: @agent, status: :ok, location: agent_path(@agent) }
              

                       else
              

app/models/agent.rb

@@ -22,7 +22,7 @@ class Agent < ActiveRecord::Base

                 
              

                   EVENT_RETENTION_SCHEDULES = [["Forever", 0], ["1 day", 1], *([2, 3, 4, 5, 7, 14, 21, 30, 45, 90, 180, 365].map {|n| ["#{n} days", n] })]
              

                 
              

                -  attr_accessible :options, :memory, :name, :type, :schedule, :controller_ids, :control_target_ids, :disabled, :source_ids, :scenario_ids, :keep_events_for, :propagate_immediately
              

                +  attr_accessible :options, :memory, :name, :type, :schedule, :controller_ids, :control_target_ids, :disabled, :source_ids, :scenario_ids, :keep_events_for, :propagate_immediately, :drop_pending_events
              

                 
              

                   json_serialize :options, :memory
              

                 
              
@@ -196,6 +196,14 @@ class Agent < ActiveRecord::Base

                     update_column :last_error_log_at, nil
              

                   end
              

                 
              

                +  def drop_pending_events
              

                +    false
              

                +  end
              

                +
              

                +  def drop_pending_events=(bool)
              

                +    set_last_checked_event_id if bool
              

                +  end
              

                +
              

                   # Callbacks
              

                 
              

                   def set_default_schedule
              

app/views/agents/_action_menu.html.erb

@@ -66,8 +66,8 @@

                         <%= form_for(agent, as: :agent, url: agent_path(agent, return: returnTo), method: 'PUT') do |f| %>
              

                           <% if agent.disabled && agent.can_receive_events? %>
              

                             <div class="form-group">
              

                -              <%= check_box_tag check_box_id = "agent#{agent.id}_drop_pending_events", 'true', false, name: :drop_pending_events %>
              

                -              <%= label_tag check_box_id, 'Drop pending events' %>
              

                +              <%= f.check_box :drop_pending_events %>
              

                +              <%= f.label :drop_pending_events, 'Drop pending events' %>
              

                               <span class="glyphicon glyphicon-question-sign hover-help" data-content="As soon as you enable this agent, it starts to receive pending events that have not been processed while it was disabled.  To prevent that from happening, you can check this option."></span>
              

                             </div>
              

                           <% end %>
              

spec/controllers/agents_controller_spec.rb

@@ -258,7 +258,7 @@ describe AgentsController do

                       agent.disabled = true
              

                       agent.last_checked_event_id = nil
              

                       agent.save!
              

                -      post :update, id: agents(:bob_website_agent).to_param, agent: { disabled: 'false' }, drop_pending_events: true
              

                +      post :update, id: agents(:bob_website_agent).to_param, agent: { disabled: 'false', drop_pending_events: 'true' }
              

                       agent.reload
              

                       agent.disabled.should == false
              

                       agent.last_checked_event_id.should == Event.maximum(:id)
              

spec/models/agent_spec.rb

@@ -852,4 +852,18 @@ describe AgentDrop do

                     interpolate(t, @wsa2).should eq('1: Formatter')
              

                     interpolate(t, @efa).should eq('0: ')
              

                   end
              

                +
              

                +  describe 'last_checked_event_id' do
              

                +    it "should be updated by setting drop_pending_events to true" do
              

                +      @wsa1.last_checked_event_id = nil
              

                +      @wsa1.save!
              

                +      @wsa1.update!(drop_pending_events: true)
              

                +      @wsa1.reload.last_checked_event_id.should == Event.maximum(:id)
              

                +    end
              

                +
              

                +    it "should not affect a virtual attribute drop_pending_events" do
              

                +      @wsa1.update!(drop_pending_events: true)
              

                +      @wsa1.reload.drop_pending_events.should == false
              

                +    end
              

                +  end
              

                 end