From 9638996386c34d1f7c8984e0d4a3e7ca8b365d6e Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 17 Sep 2017 20:36:29 +0200 Subject: [PATCH] Quick correction, to manage the region zero --- app/models/event.rb | 2 +- app/models/orga.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index d270061c..1d58e16d 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -64,7 +64,7 @@ class Event < ApplicationRecord start_date, start_date.end_of_week.end_of_day end) scope :region, (lambda do |region| - return if region.nil? || region == 'all' + return if region.nil? || region == 'all' || region.zero? temp = Region.find region where region: [temp, temp.regions].flatten end) diff --git a/app/models/orga.rb b/app/models/orga.rb index fe277d1e..36fb7815 100644 --- a/app/models/orga.rb +++ b/app/models/orga.rb @@ -33,7 +33,7 @@ class Orga < ApplicationRecord scope :kind, ->(kind) { where kind: kind } scope :region, (lambda do |region| - return if region.nil? || region == 'all' + return if region.nil? || region == 'all' || region.zero? temp = Region.find region where region: [temp, temp.regions].flatten end)