meeting fixes

2015-02-14 17:25:51 +01:00
parent 195b982ef4
commit 14ebb13bc1
7 changed files with 12 additions and 7 deletions
--- a/app/controllers/meetings_controller.rb
+++ b/app/controllers/meetings_controller.rb
@@ -6,9 +6,9 @@ class MeetingsController < ApplicationController
    unless parent.nil?
      #authorize! :show, parent
      if params[:filter]=="upcomming"
-        @meetings=parent.meetings.includes(:calentry).where("calentries.start>?",1.hour.ago)
+        @meetings=parent.meetings.upcomming
      else
-      @meetings=parent.meetings
+        @meetings=parent.meetings
      end
      @parent=parent
    end