diff --git a/helios/fixtures/legacy-election-metadata-expected.json b/helios/fixtures/legacy-election-metadata-expected.json
index 6b4214726fcff9340a4c12fbd0f870a4b9b3c5aa..476296e6109e0232b6e6d8d6b6983ae45e266c2f 100644
--- a/helios/fixtures/legacy-election-metadata-expected.json
+++ b/helios/fixtures/legacy-election-metadata-expected.json
@@ -1 +1 @@
-{"help_email": "help@heliosvoting.org", "private_p": false, "use_advanced_audit_features": true}
\ No newline at end of file
+{"help_email": "help@heliosvoting.org", "private_p": false, "randomize_answer_order": false, "use_advanced_audit_features": true}
\ No newline at end of file
diff --git a/helios/migrations/0010_auto__add_field_election_randomize_answer_order.py b/helios/migrations/0010_auto__add_field_election_randomize_answer_order.py
new file mode 100644
index 0000000000000000000000000000000000000000..96d1eb0662c93b3c1b2c77d1a34feefee5c4d526
--- /dev/null
+++ b/helios/migrations/0010_auto__add_field_election_randomize_answer_order.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Election.randomize_answer_order'
+ db.add_column('helios_election', 'randomize_answer_order',
+ self.gf('django.db.models.fields.BooleanField')(default=False),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Election.randomize_answer_order'
+ db.delete_column('helios_election', 'randomize_answer_order')
+
+
+ models = {
+ 'helios.auditedballot': {
+ 'Meta': {'object_name': 'AuditedBallot'},
+ 'added_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Election']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'raw_vote': ('django.db.models.fields.TextField', [], {}),
+ 'vote_hash': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'helios.castvote': {
+ 'Meta': {'object_name': 'CastVote'},
+ 'cast_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'invalidated_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'quarantined_p': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'released_from_quarantine_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'verified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'vote': ('helios.datatypes.djangofield.LDObjectField', [], {}),
+ 'vote_hash': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'vote_tinyhash': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True'}),
+ 'voter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Voter']"})
+ },
+ 'helios.election': {
+ 'Meta': {'object_name': 'Election'},
+ 'admin': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios_auth.User']"}),
+ 'archived_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'cast_url': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
+ 'complaint_period_ends_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'datatype': ('django.db.models.fields.CharField', [], {'default': "'legacy/Election'", 'max_length': '250'}),
+ 'description': ('django.db.models.fields.TextField', [], {}),
+ 'election_type': ('django.db.models.fields.CharField', [], {'default': "'election'", 'max_length': '250'}),
+ 'eligibility': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'encrypted_tally': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'featured_p': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'frozen_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'help_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
+ 'openreg': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'private_key': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'private_p': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'public_key': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'questions': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'randomize_answer_order': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'registration_starts_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'result': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'result_proof': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'tallies_combined_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'tallying_finished_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'tallying_started_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'tallying_starts_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'use_advanced_audit_features': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'use_voter_aliases': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+ 'voters_hash': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+ 'voting_ended_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'voting_ends_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'voting_extended_until': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'voting_started_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
+ 'voting_starts_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'})
+ },
+ 'helios.electionlog': {
+ 'Meta': {'object_name': 'ElectionLog'},
+ 'at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Election']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'log': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+ },
+ 'helios.trustee': {
+ 'Meta': {'unique_together': "(('election', 'email'),)", 'object_name': 'Trustee'},
+ 'decryption_factors': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'decryption_proofs': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Election']"}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'pok': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'public_key': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'public_key_hash': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'secret_key': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'helios.voter': {
+ 'Meta': {'unique_together': "(('election', 'voter_login_id'),)", 'object_name': 'Voter'},
+ 'alias': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+ 'cast_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Election']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios_auth.User']", 'null': 'True'}),
+ 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+ 'vote': ('helios.datatypes.djangofield.LDObjectField', [], {'null': 'True'}),
+ 'vote_hash': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+ 'voter_email': ('django.db.models.fields.CharField', [], {'max_length': '250', 'null': 'True'}),
+ 'voter_login_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+ 'voter_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
+ 'voter_password': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'})
+ },
+ 'helios.voterfile': {
+ 'Meta': {'object_name': 'VoterFile'},
+ 'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helios.Election']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'num_voters': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
+ 'processing_finished_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'processing_started_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+ 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'voter_file': ('django.db.models.fields.files.FileField', [], {'max_length': '250', 'null': 'True'}),
+ 'voter_file_content': ('django.db.models.fields.TextField', [], {'null': 'True'})
+ },
+ 'helios_auth.user': {
+ 'Meta': {'unique_together': "(('user_type', 'user_id'),)", 'object_name': 'User'},
+ 'admin_p': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'info': ('helios_auth.jsonfield.JSONField', [], {}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
+ 'token': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
+ 'user_id': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'user_type': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ }
+ }
+
+ complete_apps = ['helios']
\ No newline at end of file
diff --git a/helios/models.py b/helios/models.py
index 64733fa48aa29ebb912b5b3d4bc26f4b7db5ed41..45dba1d95cbef8618f9341795ad2c0504e7896fc 100644
--- a/helios/models.py
+++ b/helios/models.py
@@ -79,7 +79,12 @@ class Election(HeliosModel):
# voter aliases?
use_voter_aliases = models.BooleanField(default=False)
+
+ # auditing is not for everyone
use_advanced_audit_features = models.BooleanField(default=True, null=False)
+
+ # randomize candidate order?
+ randomize_answer_order = models.BooleanField(default=False, null=False)
# where votes should be cast
cast_url = models.CharField(max_length = 500)
@@ -139,7 +144,8 @@ class Election(HeliosModel):
return {
'help_email': self.help_email or 'help@heliosvoting.org',
'private_p': self.private_p,
- 'use_advanced_audit_features': self.use_advanced_audit_features
+ 'use_advanced_audit_features': self.use_advanced_audit_features,
+ 'randomize_answer_order': self.randomize_answer_order
}
@property