From e0e1d1f131355cc902be15dffef1c11081e5fde8 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Thu, 7 Oct 2021 13:11:32 +0000
Subject: [PATCH] fix bug introduced in previous PR with password uploads
---
helios/fixtures/voter-badfile.csv | 10 +++++-----
helios/fixtures/voter-file-latin1.csv | 8 ++++----
helios/fixtures/voter-file.csv | 8 ++++----
helios/models.py | 1 +
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/helios/fixtures/voter-badfile.csv b/helios/fixtures/voter-badfile.csv
index fd674a9..cc858ac 100644
--- a/helios/fixtures/voter-badfile.csv
+++ b/helios/fixtures/voter-badfile.csv
@@ -1,5 +1,5 @@
-Ben78@adida.net,Ben78 Adida
- benadida5,ben5@adida.net , Ben5 Adida
-benadida6,ben6@adida.net,Ben6 Adida
-benadida7,ben7@adida.net,Ben7 Adida
-ernesto,helios-testing-ernesto@adida.net,Erñesto Testing Helios
\ No newline at end of file
+password,Ben78@adida.net,Ben78 Adida
+password, benadida5,ben5@adida.net , Ben5 Adida
+password,benadida6,ben6@adida.net,Ben6 Adida
+password,benadida7,ben7@adida.net,Ben7 Adida
+password,ernesto,helios-testing-ernesto@adida.net,Erñesto Testing Helios
\ No newline at end of file
diff --git a/helios/fixtures/voter-file-latin1.csv b/helios/fixtures/voter-file-latin1.csv
index fdbc9b3..4c2e42a 100644
--- a/helios/fixtures/voter-file-latin1.csv
+++ b/helios/fixtures/voter-file-latin1.csv
@@ -1,4 +1,4 @@
- benadida5,ben5@adida.net , Ben5 Adida
-benadida6,ben6@adida.net,Ben6 Adida
-benadida7,ben7@adida.net,Ben7 Adida
-testlatin1,Test Latin1,J�NIO LUIZ CORREIA J�NIOR
+password, benadida5,ben5@adida.net , Ben5 Adida
+password,benadida6,ben6@adida.net,Ben6 Adida
+password,benadida7,ben7@adida.net,Ben7 Adida
+password,testlatin1,Test Latin1,J�NIO LUIZ CORREIA J�NIOR
diff --git a/helios/fixtures/voter-file.csv b/helios/fixtures/voter-file.csv
index b94bd1a..70795de 100644
--- a/helios/fixtures/voter-file.csv
+++ b/helios/fixtures/voter-file.csv
@@ -1,4 +1,4 @@
- benadida5,ben5@adida.net , Ben5 Adida
-benadida6,ben6@adida.net,Ben6 Adida
-benadida7,ben7@adida.net,Ben7 Adida
-ernesto,helios-testing-ernesto@adida.net,Erñesto Testing Helios
\ No newline at end of file
+password, benadida5,ben5@adida.net , Ben5 Adida
+password,benadida6,ben6@adida.net,Ben6 Adida
+password,benadida7,ben7@adida.net,Ben7 Adida
+password,ernesto,helios-testing-ernesto@adida.net,Erñesto Testing Helios
\ No newline at end of file
diff --git a/helios/models.py b/helios/models.py
index c485a70..fc283e9 100644
--- a/helios/models.py
+++ b/helios/models.py
@@ -818,6 +818,7 @@ class VoterFile(models.Model):
new_voter = Voter(uuid=voter_uuid, user = None, voter_login_id = voter['voter_id'],
voter_name = voter['name'], voter_email = voter['email'], election = self.election)
new_voter.generate_password()
+ election=self.election
if election.use_voter_aliases:
utils.lock_row(Election, election.id)
alias_num = election.last_alias_num + 1
--
GitLab