Fix formatting, use redirect() rather than redirect_to() which is

available in older versions of pylons.

diff --git a/swat/controllers/account.py b/swat/controllers/account.py
index 200f20476420f2dcc9e7cac18fdff39220916002..64c17968c75a81ccbc2e2a1a93d8dbcc4e8ea171 100644 (file)
--- a/swat/controllers/account.py
+++ b/swat/controllers/account.py
@@ -16,8 +16,8 @@
 import logging
 
 from formencode import variabledecode
-from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to, url_for
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect, url_for
 
 from swat.lib.base import BaseController, render
 from swat.lib.samr_manager import SAMPipeManager, User, Group
@@ -137,11 +137,11 @@ class AccountController(BaseController):
             SwatMessages.add(message, type)
             
             if subaction == "save_add":
-                redirect_to(url_for("with_subaction", controller='account', action="user", subaction="add"))
+                redirect(url_for("with_subaction", controller='account', action="user", subaction="add"))
             elif subaction == "save":
-                redirect_to(controller='account', action='user')
+                redirect(url(controller='account', action='user'))
             elif subaction == "apply":
-                redirect_to("account_action", action='user', subaction='edit', id=new_id)
+                redirect(url("account_action", action='user', subaction='edit', id=new_id))
             
         ## 
         ## Remove a Certain User or a List of Users
@@ -175,7 +175,7 @@ class AccountController(BaseController):
                 
                 SwatMessages.add(message)
                 
-            redirect_to(controller='account', action='user')
+            redirect(url(controller='account', action='user'))
             
         ##
         ## Disable a User or a List of Users
@@ -210,7 +210,7 @@ class AccountController(BaseController):
                 message = _("The following User IDs [%s] were DISABLED successfuly" % (joined))
                 SwatMessages.add(message)
                 
-            redirect_to(controller='account', action='user')
+            redirect(url(controller='account', action='user'))
 
         return render(template)
     
@@ -271,11 +271,11 @@ class AccountController(BaseController):
             SwatMessages.add(message, type)
             
             if subaction == "save_add":
-                redirect_to(url_for("with_subaction", controller='account', action="group", subaction="add"))
+                redirect(url_for("with_subaction", controller='account', action="group", subaction="add"))
             elif subaction == "save":
-                redirect_to(controller='account', action='group')
+                redirect(url(controller='account', action='group'))
             elif subaction == "apply":
-                redirect_to("account_action", action='group', subaction='edit', id=new_id)
+                redirect(url("account_action", action='group', subaction='edit', id=new_id))
             
         ## 
         ## Remove a Certain Group
@@ -296,7 +296,7 @@ class AccountController(BaseController):
                 message = _("Error deleting the Group with the ID %s - %s" % (id, cause))
                 
             SwatMessages.add(message, type)
-            redirect_to(controller='account', action='user')
+            redirect(url(controller='account', action='user'))
 
         return render(template)
         
@@ -327,7 +327,7 @@ class AccountController(BaseController):
         message = _("Editing canceled. No changes were saved.")
         SwatMessages.add(message, "warning")
         
-        redirect_to(controller='account', action=type)
+        redirect(url(controller='account', action=type))
         
     def show_groups(self):
         """ """

diff --git a/swat/controllers/authentication.py b/swat/controllers/authentication.py
index af62188866be621e5ef992c0657216144ee8d211..67d70ee1f5be90779a640e28d0a619c1caca3514 100644 (file)
--- a/swat/controllers/authentication.py
+++ b/swat/controllers/authentication.py
@@ -15,8 +15,8 @@
 # 
 import logging
 
-from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, session, tmpl_context as c, url
+from pylons.controllers.util import redirect
 
 from swat.lib.base import BaseController, render
 from swat.lib.helpers import SwatMessages
@@ -45,7 +45,7 @@ class AuthenticationController(BaseController):
         handled by the repoze.who middleware
         
         """
-        redirect_to(controller = 'authentication', action = 'login')
+        redirect(url(controller = 'authentication', action = 'login'))
         
     def __authenticate(self):
         """ Performs the custom authentication. This method is required by
@@ -157,6 +157,6 @@ class AuthenticationController(BaseController):
         
         """
         if self.__authenticate():
-            redirect_to(controller='dashboard', action='index')
+            redirect(url(controller='dashboard', action='index'))
         else:
-            redirect_to(controller='authentication', action='login')
+            redirect(url(controller='authentication', action='login'))

diff --git a/swat/controllers/dashboard.py b/swat/controllers/dashboard.py
index e66c16733aefa3b7b039676f2f7b8fe3d8a67a1d..ab8ce2294ebd9401c45d26eff200962561024dc7 100644 (file)
--- a/swat/controllers/dashboard.py
+++ b/swat/controllers/dashboard.py
@@ -16,8 +16,8 @@
 import logging
 from samba import param
 
-from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, tmpl_context as c
+from pylons.controllers.util import abort
 
 from swat.lib.base import BaseController, render
 from routes import url_for

diff --git a/swat/controllers/help.py b/swat/controllers/help.py
index b6003ca7dd8c5a26bbd1350f37cc074273aa2bfb..23c962157ac8fa3bd971c817c90e3f2b49a44d82 100644 (file)
--- a/swat/controllers/help.py
+++ b/swat/controllers/help.py
@@ -1,13 +1,11 @@
 import logging
 from samba import param
 
-from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, tmpl_context as c
 
 from swat.lib.base import BaseController, render
 
-from swat.lib.helpers import ControllerConfiguration, BreadcrumbTrail, \
-SwatMessages
+from swat.lib.helpers import ControllerConfiguration, BreadcrumbTrail
 
 log = logging.getLogger(__name__)
 

diff --git a/swat/controllers/share.py b/swat/controllers/share.py
index 9e95d576ff24078471eeb276a9f87e0edfba2412..32b5abe67ce6b3644b881a663013ea86a8d695d2 100644 (file)
--- a/swat/controllers/share.py
+++ b/swat/controllers/share.py
@@ -17,8 +17,8 @@ import logging
 from samba import param, hostconfig, ldb
 
 from formencode import variabledecode
-from pylons import request, tmpl_context as c
-from pylons.controllers.util import redirect_to
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from swat.lib.base import BaseController, render
 
 from pylons.templating import render_mako_def
@@ -124,7 +124,7 @@ class ShareController(BaseController):
                 message = _("Can't edit a Share that doesn't exist")
                 SwatMessages.add(message, "warning")
 
-                redirect_to(controller='share', action='index')
+                redirect(url(controller='share', action='index'))
             else:
                 c.p = ParamConfiguration('share-parameters')
 
@@ -138,7 +138,7 @@ class ShareController(BaseController):
             message = _("Your chosen backend is not yet supported")
             SwatMessages.add(message, "critical")
 
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
 
     def save(self):
         """ Save a Share. We enter here either from the "edit" or "add" """
@@ -181,18 +181,18 @@ class ShareController(BaseController):
 
         if has_error or not stored:
             if is_new and len(share_name) == 0:
-                redirect_to(controller='share', action='add')
+                redirect(url(controller='share', action='add'))
             elif len(share_old_name) == 0:
-                redirect_to(controller='share', action='index')
+                redirect(url(controller='share', action='index'))
             else:
-                redirect_to(controller='share', action='edit', \
-                            name=share_old_name)
+                redirect(url(controller='share', action='edit',
+                            name=share_old_name))
         elif action == "save" and stored:
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
         elif action == "apply" and stored:
-            redirect_to(controller='share', action='edit', name=share_name)
+            redirect(url(controller='share', action='edit', name=share_name))
         else:
-            redirect_to(controller='share', action='add')
+            redirect(url(controller='share', action='add'))
 
     def homes(self):
         """ Toggles the homes Share """
@@ -218,7 +218,7 @@ class ShareController(BaseController):
             SwatMessages.add(message, "critical")
             has_error = True
 
-        redirect_to(controller='share', action='index')
+        redirect(url(controller='share', action='index'))
 
     def save_add(self):
         self.save()
@@ -240,7 +240,7 @@ class ShareController(BaseController):
             message = _("Cancelled Share editing. No changes were saved!")
 
         SwatMessages.add(message, "warning")
-        redirect_to(controller='share', action='index')
+        redirect(url(controller='share', action='index'))
 
     def path(self):
         """ Returns the contents of the selected folder. Usually called via
@@ -331,12 +331,12 @@ class ShareController(BaseController):
                 message = _("Your chosen backend is not yet supported")
                 SwatMessages.add(message, "critical")
 
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
         else:
             message = _("You did not choose a Share or a group of Shares to remove")
             SwatMessages.add(message, "critical")
 
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
 
     def copy(self, name=''):
         """ Clones the chosen Share
@@ -399,10 +399,10 @@ class ShareController(BaseController):
                 message = _("Your chosen backend is not yet supported")
                 SwatMessages.add(message, "critical")
 
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
         else:
             SwatMessages.add(_("You did not choose a Share to copy"), "critical")
-            redirect_to(controller='share', action='index')
+            redirect(url(controller='share', action='index'))
 
     def toggle(self, name=''):
         """ Toggles a Share's state (enabled/disabled).
@@ -427,7 +427,8 @@ class ShareController(BaseController):
             message = _("Your chosen backend is not yet supported")
             SwatMessages.add(message, "critical")
 
-        redirect_to(controller='share', action='index')
+        redirect(url(controller='share', action='index'))
+
 
 class ShareBackend(object):
     """ ShareBackend """