Őry Máté · @orymate · Őry Máté · Őry Máté · Őry Máté · Őry Máté
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
        self.time_of_suspend, self.time_of_delete = self.get_renew_times()
        super(Instance, self).clean(*args, **kwargs)
  
-    def manual_state_change(self, new_state="NOSTATE", reason=None, user=None):
+    def manual_state_change(self, activity, new_state="NOSTATE",
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
 register_operation(RenewOperation)
  
  
+class ChangeStateOperation(InstanceOperation):
+    activity_code_suffix = 'change_state'
+    id = 'change_state'
+    name = _("change state")
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
 register_operation(RenewOperation)
  
  
+class ChangeStateOperation(InstanceOperation):
+    activity_code_suffix = 'change_state'
+    id = 'change_state'
+    name = _("change state")
+    description = _("Change the virtual machine state to NOSTATE")
+    acl_level = "owner"
+    required_perms = ('vm.change_state', )
+
+    def _operation(self, user, activity, new_state="NOSTATE",
+                   reason=None, lease=None):
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
    def get_success_url(self):
        return self.get_object().get_absolute_url() + "#resources"
  
+    def post(self, request, **kwargs):
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
            ('create_vm', _('Can create a new VM.')),
            ('config_ports', _('Can configure port forwards.')),
            ('recover', _('Can recover a destroyed VM.')),
+            ('change_state', _('Can change VM state to NOSTATE.')),
--- a/circle/vm/models/activity.py
+++ b/circle/vm/models/activity.py
  
        def __init__(self, activity, message=None):
            if message is None:
-                message = ("Another activity is currently in progress: '%s'."
-                           % activity.activity_code)
+                message = ("Another activity is currently in progress: '%s' "
+                           "(%s)."
+                           % (activity.activity_code, activity.pk))