Merge "Formating success and fail messages for flows."

savannadashboard/cluster_templates/workflows/copy.py

@@ -27,6 +27,8 @@ LOG = logging.getLogger(__name__)
 
 
 class CopyClusterTemplate(create_flow.ConfigureClusterTemplate):
+    success_message = _("Cluster Template copy %s created")
+    failure_message = _("Could not create Cluster Template copy %s")
 
     def __init__(self, request, context_seed, entry_point, *args, **kwargs):
         savanna = savannaclient.Client(request)

savannadashboard/cluster_templates/workflows/create.py

@@ -227,8 +227,8 @@ class ConfigureClusterTemplate(whelpers.ServiceParametersWorkflow):
     slug = "configure_cluster_template"
     name = _("Create Cluster Template")
     finalize_button_name = _("Create")
-    success_message = _("Created")
+    success_message = _("Created Cluster Template %s")
-    failure_message = _("Could not create")
+    failure_message = _("Could not create Cluster Template %s")
     success_url = "horizon:savanna:cluster_templates:index"
     default_steps = (GeneralConfig,
                      ConfigureNodegroups)
@@ -270,6 +270,9 @@ class ConfigureClusterTemplate(whelpers.ServiceParametersWorkflow):
             return steps_valid
         return self.validate(self.context)
 
+    def format_status_message(self, message):
+        return message % self.context["general_cluster_template_name"]
+
     def handle(self, request, context):
         try:
             savanna = savannaclient.Client(request)

savannadashboard/clusters/tables.py

@@ -36,7 +36,7 @@ class CreateCluster(tables.LinkAction):
 class DeleteCluster(tables.BatchAction):
     name = "delete"
     action_present = _("Delete")
-    action_past = _("Delete cluster of")
+    action_past = _("Deleted")
     data_type_singular = _("Cluster")
     data_type_plural = _("Clusters")
     classes = ('btn-danger', 'btn-terminate')

savannadashboard/clusters/workflows.py

@@ -159,8 +159,8 @@ class ConfigureCluster(workflows.Workflow):
     slug = "configure_cluster"
     name = _("Launch Cluster")
     finalize_button_name = _("Create")
-    success_message = _("Created")
+    success_message = _("Created Cluster %s")
-    failure_message = _("Could not create")
+    failure_message = _("Could not create Cluster %s")
     success_url = "horizon:savanna:clusters:index"
     default_steps = (GeneralConfig, )
 
@@ -183,6 +183,9 @@ class ConfigureCluster(workflows.Workflow):
             return steps_valid
         return self.validate(self.context)
 
+    def format_status_message(self, message):
+        return message % self.context["general_cluster_name"]
+
     def handle(self, request, context):
         try:
             savanna = savannaclient.Client(request)

savannadashboard/image_registry/forms.py

@@ -15,10 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
+
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms
-import json
+from horizon import messages
 
 from savannadashboard.api import client as savannaclient
 from savannadashboard.utils import importutils
@@ -50,6 +52,8 @@ class ImageForm(forms.SelfHandlingForm):
             image_tags = json.loads(data["tags_list"])
             savanna.images.update_tags(image_id, image_tags)
 
+            messages.success(request, self.message)
+
             return True
         except Exception:
             exceptions.handle(request)
@@ -57,10 +61,12 @@ class ImageForm(forms.SelfHandlingForm):
 
 
 class EditTagsForm(ImageForm):
+    message = "Image updated."
     image_id = forms.CharField(widget=forms.HiddenInput())
 
 
 class RegisterImageForm(ImageForm):
+    message = "Image registered."
     image_id = forms.ChoiceField(label=_("Image"),
                                  required=True)
 

savannadashboard/nodegroup_templates/workflows/copy.py

@@ -17,14 +17,17 @@
 
 import logging
 
-from savannadashboard.api import client as savannaclient
+from django.utils.translation import ugettext as _
 
+from savannadashboard.api import client as savannaclient
 import savannadashboard.nodegroup_templates.workflows.create as create_flow
 
 LOG = logging.getLogger(__name__)
 
 
 class CopyNodegroupTemplate(create_flow.ConfigureNodegroupTemplate):
+    success_message = _("Node Group Template copy %s created")
+    failure_message = _("Could not copy Node Group Template %s")
 
     def __init__(self, request, context_seed, entry_point, *args, **kwargs):
         savanna = savannaclient.Client(request)

savannadashboard/nodegroup_templates/workflows/create.py

@@ -157,8 +157,8 @@ class ConfigureNodegroupTemplate(whelpers.ServiceParametersWorkflow):
     slug = "configure_nodegroup_template"
     name = _("Create Node Group Template")
     finalize_button_name = _("Create")
-    success_message = _("Created")
+    success_message = _("Created Node Group Template %s")
-    failure_message = _("Could not create")
+    failure_message = _("Could not create Node Group Template %s")
     success_url = "horizon:savanna:nodegroup_templates:index"
     default_steps = (GeneralConfig,)
 
@@ -183,6 +183,9 @@ class ConfigureNodegroupTemplate(whelpers.ServiceParametersWorkflow):
                                                          entry_point,
                                                          *args, **kwargs)
 
+    def format_status_message(self, message):
+        return message % self.context["general_nodegroup_name"]
+
     def is_valid(self):
         missing = self.depends_on - set(self.context.keys())
         if missing: