Use allow_destroy. Remove condtion from form.haml.

2 files changed, 5 insertions, 15 deletions

diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 225b6253616..f7ceba0d2a5 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -8,27 +8,16 @@ module Ci
     belongs_to :owner, class_name: "User"
 
     has_many :trigger_requests, dependent: :destroy
-    has_one :trigger_schedule, dependent: :destroy
+    has_one :trigger_schedule, dependent: :destroy, inverse_of: :trigger
 
     validates :token, presence: true, uniqueness: true
 
     before_validation :set_default_values
 
-    accepts_nested_attributes_for :trigger_schedule
-
-    attr_accessor :trigger_schedule_on
+    accepts_nested_attributes_for :trigger_schedule, allow_destroy: true
 
     def set_default_values
       self.token = SecureRandom.hex(15) if self.token.blank?
-
-      if trigger_schedule_on.present?
-        if trigger_schedule_on.to_i == 1
-          self.trigger_schedule.project = project
-          self.trigger_schedule.trigger = self
-        else
-          self.trigger_schedule = nil
-        end
-      end
     end
 
     def last_trigger_request
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index d8a2770ea61..f7d602920ba 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -6,11 +6,11 @@ module Ci
     acts_as_paranoid
 
     belongs_to :project
-    belongs_to :trigger
+    belongs_to :trigger, inverse_of: :trigger_schedule
 
     delegate :ref, to: :trigger, allow_nil: true
 
-    validates :trigger, presence: { unless: :importing? }
+    validates_presence_of :trigger
     validates :cron, cron: true, presence: { unless: :importing? }
     validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
@@ -19,6 +19,7 @@ module Ci
 
     def set_next_run_at
       self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
+      self.project = trigger.project
     end
 
     def schedule_next_run!