Refactor code to use available and stopped statuses and refactor views to use separate renders

1 files changed, 7 insertions, 8 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 054d54f124e..18d9e96301c 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -11,6 +11,8 @@ class Deployment < ActiveRecord::Base
 
   delegate :name, to: :environment, prefix: true
 
+  store :properties, accessors: [:on_stop]
+
   after_save :create_ref
 
   def commit
@@ -34,7 +36,7 @@ class Deployment < ActiveRecord::Base
   end
 
   def manual_actions
-    deployable.try(:other_actions)
+    @manual_actions ||= deployable.try(:other_actions)
   end
 
   def includes_commit?(commit)
@@ -84,17 +86,14 @@ class Deployment < ActiveRecord::Base
       take
   end
 
-  def close_action
+  def stop_action
     return nil unless manual_actions
 
-    @close_action ||=
-      manual_actions.find do |manual_action|
-        manual_action.try(:closes_environment?, deployable.environment)
-      end
+    @stop_action ||= manual_actions.find_by(name: on_stop)
   end
 
-  def closeable?
-    close_action.present?
+  def stoppable?
+    on_stop.present? && stop_action.present?
   end
 
   def formatted_deployment_time