diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 14:26:14 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 14:26:56 +0100 |
commit | 55d098c94b4f7e39931d5e4084be19872386fa18 (patch) | |
tree | 86d5b4d6532908b1923ee828147dbfb470de98a7 /app/models | |
parent | 16b9e289fd5d9b96f0de96719a8d87e8342a50e6 (diff) | |
download | gitlab-ce-55d098c94b4f7e39931d5e4084be19872386fa18.tar.gz |
Fix initial status again
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/clusters/applications/helm.rb | 10 | ||||
-rw-r--r-- | app/models/clusters/concerns/application_status.rb | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb index d60bb7dcd02..0bbe5219715 100644 --- a/app/models/clusters/applications/helm.rb +++ b/app/models/clusters/applications/helm.rb @@ -11,16 +11,14 @@ module Clusters validates :cluster, presence: true + after_initialize :set_initial_status + def self.application_name self.to_s.demodulize.underscore end - def initial_status - if cluster&.platform_kubernetes_active? - :installable - else - :not_installable - end + def set_initial_status + self.status = 'installable' if cluster&.platform_kubernetes_active? end def name diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb index ce1b6621479..7b7c8eac773 100644 --- a/app/models/clusters/concerns/application_status.rb +++ b/app/models/clusters/concerns/application_status.rb @@ -4,7 +4,7 @@ module Clusters extend ActiveSupport::Concern included do - state_machine :status, initial: ->(application) { application.initial_status } do + state_machine :status, initial: :not_installable do state :not_installable, value: -2 state :errored, value: -1 state :installable, value: 0 |