Skip to content
Snippets Groups Projects
Commit 79b77b12 authored by Ben Adida's avatar Ben Adida
Browse files

small layout tweak and reversed order of permission and JSONification...

small layout tweak and reversed order of permission and JSONification annotations which were giving weird errors when bad permission
parent 3a981dd4
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
<h3 class="title">{{ election.name }}
{% if admin_p %}
{% if not election.frozen_at %}
<a class="small button" href="{% url helios.views.one_election_edit election.uuid %}">edit</a>
<small><a class="small button" href="{% url helios.views.one_election_edit election.uuid %}">edit</a></small>
{% endif %}
{% endif %}</h3>
<p style="padding-top:0px; margin-top:0px">
......
......@@ -367,8 +367,8 @@ def socialbuttons(request):
##
## As of July 2009, there are always trustees for a Helios election: one trustee is acceptable, for simple elections.
##
@json
@election_view()
@json
def list_trustees(request, election):
trustees = Trustee.get_by_election(election)
return [t.toJSONDict(complete=True) for t in trustees]
......@@ -486,8 +486,8 @@ def trustee_upload_pk(request, election, trustee):
## Ballot Management
##
@json
@election_view()
@json
def get_randomness(request, election):
"""
get some randomness to sprinkle into the sjcl entropy pool
......@@ -498,8 +498,8 @@ def get_randomness(request, election):
#"randomness" : base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes)
}
@json
@election_view(frozen=True)
@json
def encrypt_ballot(request, election):
"""
perform the ballot encryption given answers_json, a JSON'ified list of list of answers
......
......@@ -59,3 +59,7 @@ margin: 0 auto -4.5em;
.footer, .push {
height: 4.5em;
}
select {
width: auto;
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment