Changeset 12
- Timestamp:
- 01/04/07 21:06:03 (5 years ago)
- Files:
-
- trunk/djangoid/server/views.py (modified) (1 diff)
- trunk/djangoid/templates/users/login.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/djangoid/server/views.py
r11 r12 61 61 #Make sure we pass all OpenID related information in the URL 62 62 if not request.user or request.user.is_authenticated() == False: 63 return redirect_to_login(urllib.quote(r.encodeToURL("/".join([""] + settings.BASE_URL.split("/")[3:]))) , login_url = settings.BASE_URL + "login/")63 return redirect_to_login(urllib.quote(r.encodeToURL("/".join([""] + settings.BASE_URL.split("/")[3:]))) + "&tr=" + urllib.quote(r.trust_root), login_url = settings.BASE_URL + "login/") 64 64 if not request.user.username == user.djangouser: 65 65 raise Exception, "Logged in as " + request.user.username + " while expecting " + user.djangouser trunk/djangoid/templates/users/login.html
r11 r12 4 4 <p>{{ error_message }}</p> 5 5 {% endif %} 6 <div>Please provide login credentials to login at <span id="trust_root"></span></div> 6 7 <form action="{{ app_path }}" method="post" id="login-form"> 7 8 <div> … … 19 20 20 21 <script type="text/javascript"> 21 document.getElementById('id_username').focus() 22 document.getElementById('id_username').focus(); 23 24 function gup(name) 25 { 26 var regexS = "[\\?&]"+name+"=([^&#]*)"; 27 var regex = new RegExp( regexS ); 28 var tmpURL = window.location.href; 29 var results = regex.exec( tmpURL ); 30 if( results == null ) 31 return ""; 32 else 33 return results[1]; 34 } 35 document.getElementById('trust_root').innerHTML = unescape(gup("tr")); 22 36 </script> 23 37 </div>
