Merge branch 'master' of https://git.ik.bme.hu/circle3/cloud

circle/dashboard/forms.py

@@ -825,7 +825,7 @@ class VmStateChangeForm(OperationForm):
         "Forcibly interrupt all running activities."),
                                    help_text=_("Set all activities to finished state, "
                                                "but don't interrupt any tasks."))
-    new_state = forms.ChoiceField(widget=Instance.STATUS, label=_(
+    new_state = forms.ChoiceField(choices=Instance.STATUS, label=_(
         "New status"))
     reset_node = forms.BooleanField(required=False, label=_("Reset node"))