Add set_holder filter to visitors controller index and agenda actions

AyuntamientoMadrid · Jan 10, 2018 · e477409 · e477409
1 parent 35facef
commit e477409
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/visitors_controller.rb b/app/controllers/visitors_controller.rb
@@ -1,6 +1,7 @@
 class VisitorsController < ApplicationController
 
   require 'ext/string'
+  before_filter :set_holder, only: [:index, :agenda]
 
   def index
     get_events
@@ -13,7 +14,6 @@ def show
   end
 
   def agenda
-    @holder = Holder.where(id: params[:holder]).first
     if @holder.blank?
       redirect_to visitors_path, alert: t('activerecord.models.holder.not_found')
     else
@@ -28,6 +28,10 @@ def update_holders
 
   private
 
+  def set_holder
+    @holder = Holder.where(id: params[:holder]).first
+  end
+
   def get_events
     @events = search(params)
     @paginated_events = Event.published.includes(:position => [:holder,:area]).

diff --git a/app/views/visitors/headline/_holder.html.erb b/app/views/visitors/headline/_holder.html.erb
@@ -2,7 +2,7 @@
   <p>
     <span class="keywords"><%= t('main.events_for') %> </span>
     <strong class="result-m mb20">
-      <%= link_to @holder.full_name, agenda_path(@holder.id, @holder.full_name.parameterize) if @holder.present? %>
+      <%= link_to @holder.full_name, agenda_path(@holder.id, @holder.full_name.parameterize) %>
     </strong>
   </p>
 </div>