diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-04 21:19:08 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-17 20:10:13 +0300 |
commit | 0c052f116c9e093936847280e833ca8985d2d94c (patch) | |
tree | 6b8d52bd8b3ac075c7abf223571cfe14345bffc3 /app/models/concerns/subscribable.rb | |
parent | b3249bc28faecd1774558ec6f8ecc32f89c416ae (diff) |
Remove default value for `project` argument on subscribable concern
Diffstat (limited to 'app/models/concerns/subscribable.rb')
-rw-r--r-- | app/models/concerns/subscribable.rb | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/app/models/concerns/subscribable.rb b/app/models/concerns/subscribable.rb index 2210a210f33..5f2725a6d7f 100644 --- a/app/models/concerns/subscribable.rb +++ b/app/models/concerns/subscribable.rb @@ -12,45 +12,43 @@ module Subscribable has_many :subscriptions, dependent: :destroy, as: :subscribable end - def subscribed?(user, to_project = nil) - if subscription = subscriptions.find_by(user: user, project: (to_project || project)) + def subscribed?(user, project) + if subscription = subscriptions.find_by(user: user, project: project) subscription.subscribed else - subscribed_without_subscriptions?(user, to_project) + subscribed_without_subscriptions?(user, project) end end # Override this method to define custom logic to consider a subscribable as # subscribed without an explicit subscription record. - def subscribed_without_subscriptions?(user, to_project = nil) + def subscribed_without_subscriptions?(user, project) false end - def subscribers(to_project = nil) - subscriptions.where(project: (to_project || project), subscribed: true).map(&:user) + def subscribers(project) + subscriptions.where(project: project, subscribed: true).map(&:user) end - def toggle_subscription(user, to_project = nil) - subscribed = subscribed?(user, (to_project || project)) - - find_or_initialize_subscription(user, to_project). - update(subscribed: !subscribed) + def toggle_subscription(user, project) + find_or_initialize_subscription(user, project). + update(subscribed: !subscribed?(user, project)) end - def subscribe(user, to_project = nil) - find_or_initialize_subscription(user, to_project). + def subscribe(user, project) + find_or_initialize_subscription(user, project). update(subscribed: true) end - def unsubscribe(user, to_project = nil) - find_or_initialize_subscription(user, to_project). + def unsubscribe(user, project) + find_or_initialize_subscription(user, project). update(subscribed: false) end private - def find_or_initialize_subscription(user, to_project = nil) + def find_or_initialize_subscription(user, project) subscriptions. - find_or_initialize_by(user_id: user.id, project_id: (to_project || project).id) + find_or_initialize_by(user_id: user.id, project_id: project.id) end end |