From a00fb8aa927dbf04ae82ed970af3e1f566725f95 Mon Sep 17 00:00:00 2001 From: echarp Date: Wed, 11 Nov 2015 10:37:55 +0100 Subject: [PATCH] Tags can also be scoped by region and week/year --- app/controllers/tags_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 9c310542..cdd706c0 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -1,7 +1,10 @@ # Manage event tags class TagsController < InheritedResources::Base + has_scope :region, :locality, :tag, :daylimit + has_scope :period, type: :hash, using: [:year, :week] + def index - @tags = Event + @tags = apply_scopes(Event.moderated) .pluck(:tags).map(&:split).flatten .group_by { |i| i } .map { |k, v| [k, v.size] } @@ -15,7 +18,7 @@ class TagsController < InheritedResources::Base end def show - @events_future = Event.moderated.future.tag params[:id] - @events_past = Event.moderated.past.tag params[:id] + @events_future = apply_scopes(Event).moderated.future.tag params[:id] + @events_past = apply_scopes(Event).moderated.past.tag params[:id] end end