diff --git a/helios/fixtures/voter-badfile.csv b/helios/fixtures/voter-badfile.csv index fd674a999ad12a6043390c33c630dc5dd3bb2f1c..cc858ace2b861df543f3daa2a5770bedbd365bd2 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 fdbc9b3acdefe00c8febbbe07dc012aa17c90619..4c2e42a4818c5df19a15f9a0f29b59a4738be7a2 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 b94bd1a4f447e0fb34691c45914c342fa95ced85..70795def38439b1a6d28ca91824bd85906440b1a 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 c485a700492aab8fbd8460dc6e6a4a8c480df686..fc283e9da3b4bc3f21c5238e36c7eb2e64d98438 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