1 files changed, 6 insertions, 8 deletions

diff --git a/app/models/event.rb b/app/models/event.rb
index 60b8521..94a22e3 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,4 +1,4 @@
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
   
   # Associations
   
@@ -12,14 +12,12 @@ class Event < ActiveRecord::Base
   # Instance Methods
   
   def occurrences_in_range start_time, end_time
-    self.occurrences.find(
-      :all, :conditions => [
-        "start_time > ? AND end_time < ?", 
-        start_time, end_time
-      ]
+    self.occurrences.where(
+      "start_time > ? AND end_time < ?",
+      start_time, end_time
     )
-  end
-  
+  end 
+
   private
     def generate_occurences
       Occurrence.generate self