kallithea Changeset - 930f8182a884

Changeset - 930f8182a884

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-08-29 00:11:28
marcin@python-works.com

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

3 files changed with 13 insertions and 4 deletions:

pylons_app/controllers/login.py

pylons_app/lib/auth.py

pylons_app/templates/login.html

0 comments (0 inline, 0 general)

pylons_app/controllers/login.py

➞

Show inline comments

@@ @@ -33,33 +33,38 @@ from pylons_app.model.user_model import @@
 import formencode
 import logging
 log = logging.getLogger(__name__)
 class LoginController(BaseController):
     def __before__(self):
         super(LoginController, self).__before__()
     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'))
         if request.POST:
             #import Login Form validator class
             login_form = LoginForm()
             try:
                 c.form_result = login_form.to_python(dict(request.POST))
                 return redirect(url('hg_home'))
                 if c.came_from:
                     return redirect(c.came_from)
                 else:
                     return redirect(url('hg_home'))
             except formencode.Invalid as errors:
                 return htmlfill.render(
                     render('/login.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
         return render('/login.html')
     @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')

pylons_app/lib/auth.py

➞

Show inline comments

@@ @@ -219,26 +219,30 @@ class LoginRequired(object): @@
     def __call__(self, func):
         return decorator(self.__wrapper, func)
     def __wrapper(self, func, *fargs, **fkwargs):
         user = session.get('hg_app_user', AuthUser())
         log.debug('Checking login required for user:%s', user.username)
         if user.is_authenticated:
             log.debug('user %s is authenticated', user.username)
             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"""
     def __init__(self, *required_perms):
         available_perms = config['available_permissions']
         for perm in required_perms:
             if perm not in available_perms:
                 raise Exception("'%s' permission is not defined" % perm)
         self.required_perms = set(required_perms)
         self.user_perms = None

pylons_app/templates/login.html

➞

Show inline comments

@@ @@ -15,25 +15,25 @@ @@
         <!-- scripts -->
     </head>
     <body>
 <div id="login">
             <!-- login -->
             <div class="title">
                 <h5>${_('Sign In to hg-app')}</h5>
                 <div class="corner tl"></div>
                 <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 -->
                     <div class="fields">
                         <div class="field">
                             <div class="label">
                                 <label for="username">${_('Username')}:</label>
                             </div>
                             <div class="input">
                                 ${h.text('username',class_='focus',size=40)}
                             </div>

0 comments (0 inline, 0 general)