Cleaning up & Login Mechanism fixed

website/templates/website/login.html

@@ -35,11 +35,6 @@
 	{% addtoblock "js" %}
 	<script>
 	$(document).ready(function(){
-		
-		//var text = "Falscher Benutzername oder falsches Passwort!"
-		//var options = {"text": text,"layout":"top","type":"error" }
-		//noty(options);		
-		
 		$('#loginform').submit(function(e){
 			
 		    $.ajax({
@@ -53,7 +48,7 @@
 		        		noty ( { "text": data['err'],"layout":"top","type":"error" } )
 		        	}
 		        	if ( data['redirect']) {
-		        		window.location = data['redirect'];
+		        		window.location.href = data['redirect'];
 		        	}
 		        }
 		    });
@@ -78,6 +73,7 @@
                     	{% csrf_token %}
                         <input name="username" type="text"     placeholder="Benutzername">
                         <input name="password" type="password" placeholder="Passwort">
+                        <input name="next"     type="hidden"   value="{{next}}" >
                         <input                 type="submit"   placeholder="OK" value="einloggen">
                     </form>
                 </div>

website/views.py

@@ -67,21 +67,23 @@ def logout_view(request):
     return redirect( login_view )
 
 
-def login_view(request):
+def login_view( request ):
     if request.method == 'POST': # If the form has been submitted...
         username = request.POST['username']
         password = request.POST['password']
         user = authenticate(username=username, password=password)
         result = dict()
-        result['err']      = ""
-        result['redirect'] = ""
+        result['err'] = ""
         if user is not None:
             if user.is_active:
                 if not request.POST.get('remember', None):
                     request.session.set_expiry( 0 )
                 login(request, user)
-                #result['redirect'] = reverse( home_view )
                 result['redirect'] = "/"
+                print ( "Setting Redirect" )
+                if 'next' in request.POST :
+                    result['redirect'] = request.POST["next"]
+                    print ( "Using " + request.POST["next"] )
             else:
                 result['err'] = "Dein Account wurde deaktiviert."
                 # Return a 'disabled account' error message
@@ -91,5 +93,12 @@ def login_view(request):
         return HttpResponse( simplejson.dumps(result), mimetype='application/json' )
     
     else:
-        # TODO check if already logged in --------------------!!!!
-        return render( request, 'website/login.html' )
+        # Check if user already logged in
+        if request.user.is_authenticated():
+            return redirect( "/")
+            
+        if 'next' in request.GET:
+            nextPage = request.GET['next']
+        else:
+            nextPage = "/"
+        return render( request, 'website/login.html', { 'next' : nextPage } )