From c9b6c014a7ff023107166f3fc8fcfe3e667a7adb Mon Sep 17 00:00:00 2001 From: hukl Date: Wed, 18 Mar 2009 22:26:46 +0100 Subject: add missing location column to events. removed summary column from summary - we try joins instead. we can always fallback if it turns out to be a stupid idea. added proper migrations --- app/models/occurrence.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb index 6205618..4a5f64a 100644 --- a/app/models/occurrence.rb +++ b/app/models/occurrence.rb @@ -25,13 +25,11 @@ class Occurrence < ActiveRecord::Base self.delete_all(:event_id => event.id) node = event.node - summary = node.head.title duration = (event.end_time - event.start_time) occurrences = self.generate_dates(event) occurrences.each do |occurrence| self.create( - :summary => summary, :start_time => occurrence, :end_time => (occurrence + duration), :node_id => node.id, @@ -48,8 +46,8 @@ class Occurrence < ActiveRecord::Base def self.generate_dates event if event.rrule Ical_occurrences::occurrences( - event.start_time.utc.iso8601, - (Time.now + 5.years).utc.iso8601, + event.start_time, + (Time.now + 5.years), event.rrule ) else @@ -57,4 +55,12 @@ class Occurrence < ActiveRecord::Base end end + + + # Instance Methods + + def summary + node.head.title + end + end -- cgit v1.3