Skip to content

Commit

Permalink
fixing indenting, whitespace and variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
mboehn committed Oct 11, 2014
1 parent 3b80078 commit 42e2e09
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 22 deletions.
8 changes: 3 additions & 5 deletions core/models.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from django.db import models

# Create your models here.

class Config(models.Model):
welcometext = models.TextField (blank=True)
eventname = models.CharField (max_length=256)
active = models.BooleanField (default=False)
welcometext = models.TextField(blank=True)
eventname = models.CharField(max_length=256)
active = models.BooleanField(default=False)
8 changes: 4 additions & 4 deletions core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
from core.forms import UserForm

def register(request):
c = {
context = {
'form': UserForm()
}

if request.method != "POST":
return render(request, "core/register.html", c)
return render(request, "core/register.html", context)

data = request.POST.copy()
c['form'] = form = UserForm(data)
context['form'] = form = UserForm(data)

error = False

Expand All @@ -41,7 +41,7 @@ def register(request):
form.cleaned_data['email'], form.cleaned_data['password'])
except:
messages.error(request, _("Username already exists"))
return render(request, "core/register.html", c)
return render(request, "core/register.html", context)

user.first_name = form.cleaned_data['first_name']
user.last_name = form.cleaned_data['last_name']
Expand Down
5 changes: 2 additions & 3 deletions levels/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
from django.utils.translation import ugettext_lazy as _



class AnswerForm (Form):
answer = forms.CharField (max_length=128, label=_("Answer"))
class AnswerForm(Form):
answer = forms.CharField(max_length=128, label=_("Answer"))
20 changes: 10 additions & 10 deletions levels/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@

@login_required
def index(request):
c = {}
context = {}

try:
config = Config.objects.get(pk=1)
except Config.DoesNotExist:
raise Http404

c['config'] = config
context['config'] = config

if not config.active:
return render(request, "closed.html", c)
return render(request, "closed.html", context)

try:
end_level = Level.objects.latest('pk')
except Level.DoesNotExist:
return render(request, "closed.html", c)
return render(request, "closed.html", context)

user = request.user

Expand Down Expand Up @@ -69,13 +69,13 @@ def index(request):
attempt.correct = False
attempt.save()

c['level'] = level
c['form'] = AnswerForm()
return render(request, "levels.html", c)
context['level'] = level
context['form'] = AnswerForm()
return render(request, "levels.html", context)

@login_required
def done(request):
c = {}
context = {}

try:
score = Score.objects.get(user=request.user)
Expand All @@ -85,7 +85,7 @@ def done(request):
end_level = Level.objects.latest('pk')
if score.max_level == end_level.pk:
score = Score.objects.get(user=request.user)
c['score'] = score
return render(request, "done.html", c)
context['score'] = score
return render(request, "done.html", context)
else:
return HttpResponseRedirect('/')

0 comments on commit 42e2e09

Please sign in to comment.