Merge "Fix BatchAction class incongruence between documentation and c…

…ode Fixes launchpad bug #1044424"
jiangy · Sep 1, 2012 · 6e949ac · 6e949ac
2 parents 665c26f + caf8eaf
commit 6e949ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/horizon/dashboards/nova/containers/tables.py b/horizon/dashboards/nova/containers/tables.py
@@ -38,7 +38,7 @@ def wrap_delimiter(name):
 class DeleteContainer(tables.DeleteAction):
     data_type_singular = _("Container")
     data_type_plural = _("Containers")
-    completion_url = "horizon:nova:containers:index"
+    success_url = "horizon:nova:containers:index"
 
     def delete(self, request, obj_id):
         api.swift_delete_container(request, obj_id)
@@ -52,7 +52,7 @@ def get_success_url(self, request=None):
         # If the current_container is deleted, then redirect to the default
         # completion url
         if current_container in self.success_ids:
-            return self.completion_url
+            return self.success_url
         return  request.get_full_path()
 
 

diff --git a/horizon/tables/actions.py b/horizon/tables/actions.py
@@ -427,7 +427,7 @@ class BatchAction(Action):
        Optional location to redirect after completion of the delete
        action. Defaults to the current page.
     """
-    completion_url = None
+    success_url = None
 
     def __init__(self):
         self.current_present_action = 0
@@ -489,8 +489,8 @@ def get_success_url(self, request=None):
         """
         Returns the URL to redirect to after a successful action.
         """
-        if self.completion_url:
-            return self.completion_url
+        if self.success_url:
+            return self.success_url
         return request.get_full_path()
 
     def handle(self, table, request, obj_ids):