From 4fcae04f7bb4823d740a18419f21b8d154b4ef89 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 31 Oct 2016 15:40:27 -0200 Subject: Add project_id to subscriptions --- app/models/subscription.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/models/subscription.rb') diff --git a/app/models/subscription.rb b/app/models/subscription.rb index 3b8aa1eb866..f77aec0cacf 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -1,7 +1,10 @@ class Subscription < ActiveRecord::Base belongs_to :user + belongs_to :project belongs_to :subscribable, polymorphic: true + validates :user, :project, :subscribable, presence: true + validates :user_id, uniqueness: { scope: [:subscribable_id, :subscribable_type] }, presence: true -- cgit v1.2.1 From bde0202693508aa9eb3ce76876b1c64120d51ef3 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 31 Oct 2016 16:36:28 -0200 Subject: Add unique index to subscriptions on subscribable and user and project --- app/models/subscription.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/subscription.rb') diff --git a/app/models/subscription.rb b/app/models/subscription.rb index f77aec0cacf..f881d999384 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -5,7 +5,7 @@ class Subscription < ActiveRecord::Base validates :user, :project, :subscribable, presence: true - validates :user_id, - uniqueness: { scope: [:subscribable_id, :subscribable_type] }, + validates :project_id, + uniqueness: { scope: [:subscribable_id, :subscribable_type, :user_id] }, presence: true end -- cgit v1.2.1 From 0aac2e0706cd767993148826d723aa3641cbb2a4 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 14 Nov 2016 20:42:22 -0200 Subject: Allow subscriptions to be created without a project --- app/models/subscription.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/models/subscription.rb') diff --git a/app/models/subscription.rb b/app/models/subscription.rb index f881d999384..17869c8bac2 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -3,9 +3,7 @@ class Subscription < ActiveRecord::Base belongs_to :project belongs_to :subscribable, polymorphic: true - validates :user, :project, :subscribable, presence: true + validates :user, :subscribable, presence: true - validates :project_id, - uniqueness: { scope: [:subscribable_id, :subscribable_type, :user_id] }, - presence: true + validates :project_id, uniqueness: { scope: [:subscribable_id, :subscribable_type, :user_id] } end -- cgit v1.2.1