Browse Source

rename scope

pull/1801/head
Kat 3 years ago
parent
commit
e5505e1c49
  1. 4
      app/controllers/locations_controller.rb
  2. 4
      app/controllers/schemes_controller.rb
  3. 2
      app/models/lettings_log.rb

4
app/controllers/locations_controller.rb

@ -170,7 +170,7 @@ class LocationsController < ApplicationController
end end
def deactivate_confirm def deactivate_confirm
@affected_logs = @location.lettings_logs.visible.filter_by_before_startdate(params[:deactivation_date]) @affected_logs = @location.lettings_logs.visible.after_date(params[:deactivation_date])
if @affected_logs.count.zero? if @affected_logs.count.zero?
deactivate deactivate
else else
@ -271,7 +271,7 @@ private
end end
def reset_location_and_scheme_for_logs! def reset_location_and_scheme_for_logs!
logs = @location.lettings_logs.visible.filter_by_before_startdate(params[:deactivation_date].to_time) logs = @location.lettings_logs.visible.after_date(params[:deactivation_date].to_time)
logs.update!(location: nil, scheme: nil, unresolved: true) logs.update!(location: nil, scheme: nil, unresolved: true)
logs logs
end end

4
app/controllers/schemes_controller.rb

@ -51,7 +51,7 @@ class SchemesController < ApplicationController
end end
def deactivate_confirm def deactivate_confirm
@affected_logs = @scheme.lettings_logs.visible.filter_by_before_startdate(params[:deactivation_date]) @affected_logs = @scheme.lettings_logs.visible.after_date(params[:deactivation_date])
if @affected_logs.count.zero? if @affected_logs.count.zero?
deactivate deactivate
else else
@ -335,7 +335,7 @@ private
end end
def reset_location_and_scheme_for_logs! def reset_location_and_scheme_for_logs!
logs = @scheme.lettings_logs.visible.filter_by_before_startdate(params[:deactivation_date].to_time) logs = @scheme.lettings_logs.visible.after_date(params[:deactivation_date].to_time)
logs.update!(location: nil, scheme: nil, unresolved: true) logs.update!(location: nil, scheme: nil, unresolved: true)
logs logs
end end

2
app/models/lettings_log.rb

@ -50,7 +50,7 @@ class LettingsLog < Log
.or(filter_by_postcode(param)) .or(filter_by_postcode(param))
.or(filter_by_id(param)) .or(filter_by_id(param))
} }
scope :filter_by_before_startdate, ->(date) { where("lettings_logs.startdate >= ?", date) } scope :after_date, ->(date) { where("lettings_logs.startdate >= ?", date) }
scope :unresolved, -> { where(unresolved: true) } scope :unresolved, -> { where(unresolved: true) }
scope :filter_by_organisation, ->(org, _user = nil) { where(owning_organisation: org).or(where(managing_organisation: org)) } scope :filter_by_organisation, ->(org, _user = nil) { where(owning_organisation: org).or(where(managing_organisation: org)) }

Loading…
Cancel
Save