X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9f9d9df8887c181828f37867c16bc3e83a6fa59..ad3ca54e286d8bb733afb96b64d421c07faa358b:/app/controllers/notes_controller.rb diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 9d156ea1d..94d0fdb55 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -328,11 +328,13 @@ class NotesController < ApplicationController end if closed_since < 0 - notes.where("status != 'hidden'") + notes.where.not(:status => "hidden") elsif closed_since > 0 - notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))") + notes.where(:status => "open") + .or(notes.where(:status => "closed") + .where(notes.arel_table[:closed_at].gt(Time.now - closed_since.days))) else - notes.where("status = 'open'") + notes.where(:status => "open") end end