Making it pretty

This commit is contained in:
Raynaldo Rivera
2014-10-05 18:34:02 -07:00
parent a021141b47
commit b748c223c8
25 changed files with 231 additions and 142 deletions

View File

@@ -55,15 +55,18 @@ class AllianceUserManager(BaseUserManager):
user.save(using=self._db)
return user
def update_user_main_character(self,character_id, user_id):
def update_user_main_character(self, character_id, user_id):
user = AllianceUser.objects.get(id=user_id)
user.main_char_id = character_id
user.save(update_fields=['main_char_id'])
def check_if_user_exist(self, user_id):
def check_if_user_exist_by_id(self, user_id):
return AllianceUser.objects.filter(id=user_id).exists()
# The icv user
def check_if_user_exist_by_name(self, user_name):
return AllianceUser.objects.filter(username=user_name).exists()
class AllianceUser(AbstractBaseUser):
username = models.CharField(max_length = 40,unique=True)
email = models.EmailField(max_length=255,unique=True)

View File

@@ -1,10 +1,10 @@
from django.contrib.auth import authenticate, login, logout
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, render
from django.views.decorators.csrf import csrf_exempt
from django.template import RequestContext
from forms import LoginForm
# Create your views here.
def login_user(request):
if request.method == 'POST':
@@ -15,11 +15,14 @@ def login_user(request):
if user is not None:
if user.is_active:
login(request, user)
return HttpResponseRedirect("/")
return HttpResponseRedirect("/dashboard")
return render_to_response('public/login.html', {'form': form, 'error': True},
context_instance=RequestContext(request))
else:
form = LoginForm()
return render_to_response('public/login.html',{'form':form}, context_instance=RequestContext(request))
return render_to_response('public/login.html', {'form': form}, context_instance=RequestContext(request))
def logout_user(request):