Revision 5ed6816e astakos/im/views.py
| b/astakos/im/views.py | ||
|---|---|---|
| 54 | 54 |
from django.utils.http import urlencode |
| 55 | 55 |
from django.utils.translation import ugettext as _ |
| 56 | 56 |
from django.core.urlresolvers import reverse |
| 57 |
from django.contrib.auth.forms import AuthenticationForm |
|
| 58 | 57 |
from django.contrib.auth.models import AnonymousUser |
| 59 | 58 |
from django.contrib.auth.decorators import login_required |
| 60 | 59 |
from django.contrib.sites.models import Site |
| ... | ... | |
| 66 | 65 |
from astakos.im.models import AstakosUser, Invitation |
| 67 | 66 |
from astakos.im.util import isoformat, get_or_create_user, get_context |
| 68 | 67 |
from astakos.im.backends import get_backend |
| 69 |
from astakos.im.forms import ProfileForm, FeedbackForm |
|
| 68 |
from astakos.im.forms import ProfileForm, FeedbackForm, LoginForm
|
|
| 70 | 69 |
|
| 71 | 70 |
def render_response(template, tab=None, status=200, context_instance=None, **kwargs): |
| 72 | 71 |
""" |
| ... | ... | |
| 99 | 98 |
|
| 100 | 99 |
""" |
| 101 | 100 |
return render_response(template_name, |
| 102 |
form = AuthenticationForm(),
|
|
| 101 |
form = LoginForm(),
|
|
| 103 | 102 |
context_instance = get_context(request, extra_context)) |
| 104 | 103 |
|
| 105 | 104 |
def _generate_invitation_code(): |
| ... | ... | |
| 164 | 163 |
""" |
| 165 | 164 |
status = None |
| 166 | 165 |
message = None |
| 167 |
inviter = request.user
|
|
| 168 |
|
|
| 166 |
inviter = AstakosUser.objects.get(username = request.user.username)
|
|
| 167 |
|
|
| 169 | 168 |
if request.method == 'POST': |
| 170 | 169 |
username = request.POST.get('uniq')
|
| 171 | 170 |
realname = request.POST.get('realname')
|
| ... | ... | |
| 287 | 286 |
signup.html or ``template_name`` keyword argument. |
| 288 | 287 |
""" |
| 289 | 288 |
if not backend: |
| 290 |
backend = get_backend() |
|
| 289 |
backend = get_backend(request)
|
|
| 291 | 290 |
try: |
| 292 |
form = backend.get_signup_form(request)
|
|
| 291 |
form = backend.get_signup_form() |
|
| 293 | 292 |
if request.method == 'POST': |
| 294 | 293 |
if form.is_valid(): |
| 295 |
status, message = backend.signup(request)
|
|
| 294 |
status, message = backend.signup(form)
|
|
| 296 | 295 |
# rollback incase of error |
| 297 | 296 |
if status == messages.ERROR: |
| 298 | 297 |
transaction.rollback() |
| 299 | 298 |
else: |
| 300 | 299 |
transaction.commit() |
| 301 |
next = request.POST.get('next')
|
|
| 302 |
if next: |
|
| 303 |
return redirect(next) |
|
| 300 |
next = request.POST.get('next')
|
|
| 301 |
if next:
|
|
| 302 |
return redirect(next)
|
|
| 304 | 303 |
messages.add_message(request, status, message) |
| 305 |
except (Invitation.DoesNotExist, Exception), e:
|
|
| 304 |
except Invitation.DoesNotExist, e:
|
|
| 306 | 305 |
messages.add_message(request, messages.ERROR, e) |
| 307 | 306 |
return render_response(template_name, |
| 308 | 307 |
form = form if 'form' in locals() else UserCreationForm(), |
Also available in: Unified diff