From 31f36b6b40e17651f90cbaf52dbda7b71db320fb Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@adida.net> Date: Tue, 4 Oct 2011 06:23:50 -0700 Subject: [PATCH] ff 3.6 compat --- helios/urls.py | 1 + helios/views.py | 3 +++ heliosbooth | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/helios/urls.py b/helios/urls.py index 6b19f88..1858771 100644 --- a/helios/urls.py +++ b/helios/urls.py @@ -9,6 +9,7 @@ urlpatterns = None urlpatterns = patterns('', (r'^$', home), + (r'^test$', test), (r'^autologin$', admin_autologin), (r'^testcookie$', test_cookie), (r'^testcookie_2$', test_cookie_2), diff --git a/helios/views.py b/helios/views.py index 30fd9c2..2c7abc5 100644 --- a/helios/views.py +++ b/helios/views.py @@ -173,6 +173,9 @@ def election_vote_shortcut(request, election_short_name): else: raise Http404 +def test(request): + return HttpResponse("""{"cast_url": "https://vote.heliosvoting.org/helios/elections/8483b55e-e37d-11e0-933e-12313f028a58/cast", "description": "The 2011 election is being held to fill three of nine IACR Director positions. The three directors whose terms are expiring are Josh Benaloh, Stuart Haber, and Antoine Joux. The election committee consists of Serge Vaudenay (Chair), Greg Rose, and Martijn Stam. The candidates' list as well as their statements are available on http://www.iacr.org/elections/2011/candidates.html.", "frozen_at": "2011-09-30 18:27:26.113445", "name": "IACR Elections 2011 - Renewal of the Board of Directors", "openreg": false, "public_key": {"g": "14887492224963187634282421537186040801304008017743492304481737382571933937568724473847106029915040150784031882206090286938661464458896494215273989547889201144857352611058572236578734319505128042602372864570426550855201448111746579871811249114781674309062693442442368697449970648232621880001709535143047913661432883287150003429802392229361583608686643243349727791976247247948618930423866180410558458272606627111270040091203073580238905303994472202930783207472394578498507764703191288249547659899997131166130259700604433891232298182348403175947450284433411265966789131024573629546048637848902243503970966798589660808533", "p": "16328632084933010002384055033805457329601614771185955389739167309086214800406465799038583634953752941675645562182498120750264980492381375579367675648771293800310370964745767014243638518442553823973482995267304044326777047662957480269391322789378384619428596446446984694306187644767462460965622580087564339212631775817895958409016676398975671266179637898557687317076177218843233150695157881061257053019133078545928983562221396313169622475509818442661047018436264806901023966236718367204710755935899013750306107738002364137917426595737403871114187750804346564731250609196846638183903982387884578266136503697493474682071", "q": "61329566248342901292543872769978950870633559608669337131139375508370458778917", "y": "1313845404048607743795199204849453489713001415081380345084556386994449256572337803248245188692131913059332521431003413822160700974681964392034569573711111200281580314541519901656258460060561013197332041302009024279629563081311463295526287788113008677452964000783965057020032836881036122347456948570785399629020602895657943498352491326629611450640059230242847321995847966541558467811658117803650149156174182553423501228212853995887340663599695620215937816261071802183365164377194207579372383866802777944026337431520050032658221386174741604116613783491291871696323100005392441924319829644514298537036595375905284323380"}, "questions": [{"answer_urls": [null, null, null, null, null, null], "answers": ["Josh Benaloh", "Alexandra Boldyreva", "Shai Halevi", "Phong Nguyen", "Tom Shrimpton", "Nigel Smart"], "choice_type": "approval", "max": null, "min": 0, "question": "Who do you vote for to serve as Director of the IACR for the next 3 years (2012-2014)? Even though there are 3 available positions, you can vote for as many candidates as you desire. The 3 candidates with the most number of votes will be elected.", "result_type": "absolute", "short_name": "Who do you vote for to serve as Director of the IACR for the next 3 years (2012-2014)? Even though there are 3 available positions, you can vote for as many candidates as you desire. The 3 candidates with the most number of votes will be elected.", "tally_type": "homomorphic"}], "short_name": "IACR-Elections-2011", "use_voter_aliases": true, "uuid": "8483b55e-e37d-11e0-933e-12313f028a58", "voters_hash": null, "voting_ends_at": null, "voting_starts_at": null}"""); + @election_view() def _castvote_shortcut_by_election(request, election, cast_vote): return render_template(request, 'castvote', {'cast_vote' : cast_vote, 'vote_content': cast_vote.vote.toJSON(), 'the_voter': cast_vote.voter, 'election': election}) diff --git a/heliosbooth b/heliosbooth index 2db07ea..c50c3db 160000 --- a/heliosbooth +++ b/heliosbooth @@ -1 +1 @@ -Subproject commit 2db07ea1bd9dba20fba1e3d62c1a720768e73a44 +Subproject commit c50c3dba4986e60bedabf0e7b42befa9b526d6fb -- GitLab