aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-05-08 11:55:50 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-05-08 11:55:50 +0100
commit68f9f10e94c794d57c7b48e0bc191d51201ece16 (patch)
tree60f5970f3497f40c3d4eb00aeb749bf09709ebb2 /lib
parent409e88059e43d1a9c0df43a1df466c56e1dd9cbb (diff)
Changed Person#resolve_notification to match the signature for the people_list
version.
Diffstat (limited to 'lib')
-rw-r--r--lib/mauve/person.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/mauve/person.rb b/lib/mauve/person.rb
index d5e5ea9..6ad6706 100644
--- a/lib/mauve/person.rb
+++ b/lib/mauve/person.rb
@@ -302,7 +302,18 @@ module Mauve
return CalendarInterface.is_user_off_sick?(self.username, at)
end
- def resolve_notifications(default_every=nil, default_during=nil, at = nil)
+ # Returns a list of notification blocks for this person, using the default
+ # "during" and "every" paramaters if given. The "at" and "people_seen"
+ # parameters are not used, but are in place to keep the signature the same
+ # as the method in people_list.
+ #
+ # @paran [Numeric] default_every
+ # @param [Block] default_during
+ # @param [Time] at The time at which the resolution should take place
+ # @param [Array] people_seen A list of people/people_lists already seen.
+ # @returns [Array] array of notification blocks.
+ #
+ def resolve_notifications(default_every=nil, default_during=nil, at = nil, people_seen = [])
self.notifications.collect do |notification|
this_notification = Notification.new(self)
this_notification.every = default_every || notification.every