summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Adam <yuval@top7.com>2011-03-10 18:22:22 +0200
committerYuval Adam <yuval@top7.com>2011-03-10 18:22:22 +0200
commit60669ea7995963b132fc061240ed45aee0808f6e (patch)
tree1331d63067afb5fe1267ae1a90dade991cf356ac
parent708b1c943c636eefaeb491e30f5a8339905471c1 (diff)
added head 2 headHEADmaster
-rw-r--r--main/views.py8
-rw-r--r--urls.py2
2 files changed, 10 insertions, 0 deletions
diff --git a/main/views.py b/main/views.py
index 56c1394..883af82 100644
--- a/main/views.py
+++ b/main/views.py
@@ -1,3 +1,4 @@
+from django.db.models import Q
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response
from django.template import RequestContext
@@ -13,6 +14,13 @@ def index(request):
players = Player.objects.all().order_by('name')
return render_to_response('main.html', {'matches' : matches, 'players' : players}, context_instance=RequestContext(request))
+def headToHead(request, p1, p2):
+ matches = Match.objects.filter( (Q(player1=p1) | Q(player2=p1) | Q(player3=p1) | Q(player4=p1))
+ & (Q(player1=p2) | Q(player2=p2) | Q(player3=p2) | Q(player4=p2)) )
+
+ players = Player.objects.all().order_by('name')
+ return render_to_response('main.html', {'matches' : matches, 'players' : players}, context_instance=RequestContext(request))
+
def match(request):
p1 = Player.objects.get(id=int(request.POST.get('p1')))
p2 = Player.objects.get(id=int(request.POST.get('p2')))
diff --git a/urls.py b/urls.py
index 940a444..d34f879 100644
--- a/urls.py
+++ b/urls.py
@@ -7,7 +7,9 @@ admin.autodiscover()
urlpatterns = patterns('',
(r'^$', 'fooz.main.views.index'),
+ (r'^h2h/(\d)/(\d)/$', 'fooz.main.views.headToHead'),
(r'^match/$', 'fooz.main.views.match'),
+
# Example:
# (r'^fooz/', include('fooz.foo.urls')),