From 692f08199495841b1074d466eb88758cadb04e65 Mon Sep 17 00:00:00 2001 From: Dudás Ádám Date: Tue, 29 Apr 2014 18:17:15 +0200 Subject: [PATCH] vm: revised implementation of InstanceActivity.is_abortable --- circle/vm/models/activity.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/circle/vm/models/activity.py b/circle/vm/models/activity.py index d48dcc2..7b07e0f 100644 --- a/circle/vm/models/activity.py +++ b/circle/vm/models/activity.py @@ -67,6 +67,15 @@ class InstanceActivity(ActivityModel): else: return 'failed' + @property + def is_abortable(self): + """Can the activity be aborted? + + :returns: True if the activity can be aborted; otherwise, False. + """ + op = self.instance.get_operation_from_activity_code(self.activity_code) + return self.task_uuid and op and op.abortable and not self.finished + @classmethod def create(cls, code_suffix, instance, task_uuid=None, user=None, concurrency_check=True): @@ -108,10 +117,6 @@ class InstanceActivity(ActivityModel): self.instance._update_status() return ret - def is_abortable(self): - op = self.instance.get_operation_from_activity_code(self.activity_code) - return False if op is None else (op.abortable and not self.finished) - def abort(self): AbortableAsyncResult(self.task_uuid, backend=celery.backend).abort() -- libgit2 0.26.0