summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorhukl <contact@smyck.org>2009-03-18 22:26:46 +0100
committerhukl <contact@smyck.org>2009-03-18 22:26:46 +0100
commitc9b6c014a7ff023107166f3fc8fcfe3e667a7adb (patch)
treee6189791e25a14e27247358545000c2041c7b45a /app/models
parent8228443e37016c5c3686b6352c96f8270cb4a245 (diff)
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
Diffstat (limited to 'app/models')
-rw-r--r--app/models/occurrence.rb14
1 files changed, 10 insertions, 4 deletions
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
25 self.delete_all(:event_id => event.id) 25 self.delete_all(:event_id => event.id)
26 26
27 node = event.node 27 node = event.node
28 summary = node.head.title
29 duration = (event.end_time - event.start_time) 28 duration = (event.end_time - event.start_time)
30 occurrences = self.generate_dates(event) 29 occurrences = self.generate_dates(event)
31 30
32 occurrences.each do |occurrence| 31 occurrences.each do |occurrence|
33 self.create( 32 self.create(
34 :summary => summary,
35 :start_time => occurrence, 33 :start_time => occurrence,
36 :end_time => (occurrence + duration), 34 :end_time => (occurrence + duration),
37 :node_id => node.id, 35 :node_id => node.id,
@@ -48,8 +46,8 @@ class Occurrence < ActiveRecord::Base
48 def self.generate_dates event 46 def self.generate_dates event
49 if event.rrule 47 if event.rrule
50 Ical_occurrences::occurrences( 48 Ical_occurrences::occurrences(
51 event.start_time.utc.iso8601, 49 event.start_time,
52 (Time.now + 5.years).utc.iso8601, 50 (Time.now + 5.years),
53 event.rrule 51 event.rrule
54 ) 52 )
55 else 53 else
@@ -57,4 +55,12 @@ class Occurrence < ActiveRecord::Base
57 end 55 end
58 56
59 end 57 end
58
59
60 # Instance Methods
61
62 def summary
63 node.head.title
64 end
65
60end 66end