Commit 09ef69b7 authored by Valery Sizov's avatar Valery Sizov

code folding fix

parent 9698b36c
...@@ -134,9 +134,9 @@ module Issuable ...@@ -134,9 +134,9 @@ module Issuable
end end
def subscribe_status(user) def subscribe_status(user)
sub = subscribes.find_by_user_id(user.id) subscribe = subscribes.find_by_user_id(user.id)
if sub if subscribe
return sub.subscribed return subscribe.subscribed
end end
participants.include?(user) participants.include?(user)
......
class Subscribe < ActiveRecord::Base class Subscribe < ActiveRecord::Base
belongs_to :user belongs_to :user
validates :issue_id, uniqueness: { scope: :user_id, allow_nil: true }
validates :merge_request_id, uniqueness: { scope: :user_id, allow_nil: true }
end end
...@@ -368,16 +368,16 @@ class NotificationService ...@@ -368,16 +368,16 @@ class NotificationService
recipients = reject_muted_users(recipients, project) recipients = reject_muted_users(recipients, project)
recipients = reject_mention_users(recipients, project) recipients = reject_mention_users(recipients, project)
recipients = add_subscribers(recipients, project) recipients = add_subscribed_users(recipients, project)
recipients = recipients.concat(project_watchers(project)).uniq recipients = recipients.concat(project_watchers(project)).uniq
recipients = reject_unsubscribed_users(recipients, target) recipients = reject_unsubscribed_users(recipients, target)
recipients recipients
end end
def add_subscribers(recipients, target) def add_subscribed_users(recipients, target)
subs = target.subscribes subscribes = target.subscribes
if subs.any? if subscribes.any?
recipients.merge(subs.where("subscribed is true").map(&:user)) recipients.merge(subscribes.where("subscribed is true").map(&:user))
else else
recipients recipients
end end
......
...@@ -8,5 +8,9 @@ class CreateSubscribesTable < ActiveRecord::Migration ...@@ -8,5 +8,9 @@ class CreateSubscribesTable < ActiveRecord::Migration
t.timestamps t.timestamps
end end
add_index :subscribes, :user_id
add_index :subscribes, :issue_id
add_index :subscribes, :merge_request_id
end end
end end
...@@ -406,6 +406,10 @@ ActiveRecord::Schema.define(version: 20150313012111) do ...@@ -406,6 +406,10 @@ ActiveRecord::Schema.define(version: 20150313012111) do
t.datetime "updated_at" t.datetime "updated_at"
end end
add_index "subscribes", ["issue_id"], name: "index_subscribes_on_issue_id", using: :btree
add_index "subscribes", ["merge_request_id"], name: "index_subscribes_on_merge_request_id", using: :btree
add_index "subscribes", ["user_id"], name: "index_subscribes_on_user_id", using: :btree
create_table "taggings", force: true do |t| create_table "taggings", force: true do |t|
t.integer "tag_id" t.integer "tag_id"
t.integer "taggable_id" t.integer "taggable_id"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment