Added redirection to page that request came from, after login in

pylons_app/controllers/login.py

@@ -42,6 +42,8 class LoginController(BaseController):
 
     def index(self):
         #redirect if already logged in
+        c.came_from = request.GET.get('came_from',None)
+        
         if c.hg_app_user.is_authenticated:
             return redirect(url('hg_home'))
         
@@ -50,6 +52,9 class LoginController(BaseController):
             login_form = LoginForm()
             try:
                 c.form_result = login_form.to_python(dict(request.POST))
+                if c.came_from:
+                    return redirect(c.came_from)
+                else:
                 return redirect(url('hg_home'))
                                
             except formencode.Invalid as errors:

pylons_app/lib/auth.py

@@ -228,8 +228,12 class LoginRequired(object):
             return func(*fargs, **fkwargs)
         else:
             log.warn('user %s not authenticated', user.username)
-            log.debug('redirecting to login page')
-            return redirect(url('login_home'))
+
+            p = request.environ.get('PATH_INFO')
+            if request.environ.get('QUERY_STRING'):
+                p+='?'+request.environ.get('QUERY_STRING')
+            log.debug('redirecting to login page with %',p)                
+            return redirect(url('login_home',came_from=p))
 
 class PermsDecorator(object):
     """Base class for decorators"""

pylons_app/templates/login.html

@@ -24,7 +24,7
                 <div class="corner tr"></div>
             </div>
             <div class="inner">            
-                ${h.form(h.url.current())}
+                ${h.form(h.url.current(came_from=c.came_from))}
                 <div class="form">
                     <!-- fields -->