From 1494abe982583c564969baaba7daa251ef333156 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Thu, 10 Nov 2016 13:59:26 +0100 Subject: Allow to stop any environment --- app/models/environment.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'app/models/environment.rb') diff --git a/app/models/environment.rb b/app/models/environment.rb index 73f415c0ef0..5c662bbab87 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -85,13 +85,18 @@ class Environment < ActiveRecord::Base external_url.gsub(/\A.*?:\/\//, '') end - def stoppable? + def can_run_stop_action? available? && stop_action.present? end - def stop!(current_user) - return unless stoppable? + def run_stop!(current_user) + return unless available? - stop_action.play(current_user) + if stop_action.present? + stop_action.play(current_user) + else + stop + nil + end end end -- cgit v1.2.3