Skip to content

Commit

Permalink
Automatic commit: replace auth by helios_auth everywhere
Browse files Browse the repository at this point in the history 
git ls-files|xargs sed -i -r 's/(\W|^)auth(\W|$)/\1helios_auth\2/g'
  • Loading branch information
@glondu @benadida
glondu authored and benadida committed Feb 23, 2013
1 parent cbffa0f commit afe8597
Show file tree
Hide file tree
Showing 49 changed files with 265 additions and 265 deletions.
2 changes: 1 addition & 1 deletion helios/fixtures/legacy-data.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helios/fixtures/users.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"pk": 1, "model": "auth.user", "fields": {"info": "{}", "user_id": "[email protected]", "name": "Ben Adida", "user_type": "google", "token": null, "admin_p": false}},{"pk": 2, "model": "auth.user", "fields": {"info": "{}", "user_id": "12345", "name": "Ben Adida", "user_type": "facebook", "token": {"access_token":"1234"}, "admin_p": false}}]
[{"pk": 1, "model": "helios_auth.user", "fields": {"info": "{}", "user_id": "[email protected]", "name": "Ben Adida", "user_type": "google", "token": null, "admin_p": false}},{"pk": 2, "model": "helios_auth.user", "fields": {"info": "{}", "user_id": "12345", "name": "Ben Adida", "user_type": "facebook", "token": {"access_token":"1234"}, "admin_p": false}}]
66 changes: 33 additions & 33 deletions helios/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ def forwards(self, orm):
# Adding model 'Election'
db.create_table('helios_election', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('admin', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
('admin', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['helios_auth.User'])),
('uuid', self.gf('django.db.models.fields.CharField')(max_length=50)),
('short_name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('name', self.gf('django.db.models.fields.CharField')(max_length=250)),
('description', self.gf('django.db.models.fields.TextField')()),
('public_key', self.gf('auth.jsonfield.JSONField')(null=True)),
('private_key', self.gf('auth.jsonfield.JSONField')(null=True)),
('questions', self.gf('auth.jsonfield.JSONField')(null=True)),
('eligibility', self.gf('auth.jsonfield.JSONField')(null=True)),
('public_key', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('private_key', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('questions', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('eligibility', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('openreg', self.gf('django.db.models.fields.BooleanField')(default=False)),
('featured_p', self.gf('django.db.models.fields.BooleanField')(default=False)),
('use_voter_aliases', self.gf('django.db.models.fields.BooleanField')(default=False)),
Expand All @@ -39,9 +39,9 @@ def forwards(self, orm):
('tallying_finished_at', self.gf('django.db.models.fields.DateTimeField')(default=None, null=True)),
('tallies_combined_at', self.gf('django.db.models.fields.DateTimeField')(default=None, null=True)),
('voters_hash', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
('encrypted_tally', self.gf('auth.jsonfield.JSONField')(null=True)),
('result', self.gf('auth.jsonfield.JSONField')(null=True)),
('result_proof', self.gf('auth.jsonfield.JSONField')(null=True)),
('encrypted_tally', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('result', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('result_proof', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
))
db.send_create_signal('helios', ['Election'])

Expand Down Expand Up @@ -75,7 +75,7 @@ def forwards(self, orm):
('voter_id', self.gf('django.db.models.fields.CharField')(max_length=100)),
('uuid', self.gf('django.db.models.fields.CharField')(max_length=50)),
('alias', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
('vote', self.gf('auth.jsonfield.JSONField')(null=True)),
('vote', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('vote_hash', self.gf('django.db.models.fields.CharField')(max_length=100, null=True)),
('cast_at', self.gf('django.db.models.fields.DateTimeField')(null=True)),
))
Expand All @@ -85,7 +85,7 @@ def forwards(self, orm):
db.create_table('helios_castvote', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('voter', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['helios.Voter'])),
('vote', self.gf('auth.jsonfield.JSONField')()),
('vote', self.gf('helios_auth.jsonfield.JSONField')()),
('vote_hash', self.gf('django.db.models.fields.CharField')(max_length=100)),
('cast_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('verified_at', self.gf('django.db.models.fields.DateTimeField')(null=True)),
Expand All @@ -111,12 +111,12 @@ def forwards(self, orm):
('name', self.gf('django.db.models.fields.CharField')(max_length=200)),
('email', self.gf('django.db.models.fields.EmailField')(max_length=75)),
('secret', self.gf('django.db.models.fields.CharField')(max_length=100)),
('public_key', self.gf('auth.jsonfield.JSONField')(null=True)),
('public_key', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('public_key_hash', self.gf('django.db.models.fields.CharField')(max_length=100)),
('secret_key', self.gf('auth.jsonfield.JSONField')(null=True)),
('pok', self.gf('auth.jsonfield.JSONField')(null=True)),
('decryption_factors', self.gf('auth.jsonfield.JSONField')(null=True)),
('decryption_proofs', self.gf('auth.jsonfield.JSONField')(null=True)),
('secret_key', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('pok', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('decryption_factors', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
('decryption_proofs', self.gf('helios_auth.jsonfield.JSONField')(null=True)),
))
db.send_create_signal('helios', ['Trustee'])

Expand Down Expand Up @@ -146,13 +146,13 @@ def backwards(self, orm):


models = {
'auth.user': {
'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': ('auth.jsonfield.JSONField', [], {}),
'info': ('helios_auth.jsonfield.JSONField', [], {}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
'token': ('auth.jsonfield.JSONField', [], {'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'})
},
Expand All @@ -170,31 +170,31 @@ def backwards(self, orm):
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'invalidated_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
'verified_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
'vote': ('auth.jsonfield.JSONField', [], {}),
'vote': ('helios_auth.jsonfield.JSONField', [], {}),
'vote_hash': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'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['auth.User']"}),
'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'}),
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {}),
'eligibility': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'encrypted_tally': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'eligibility': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'encrypted_tally': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'featured_p': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'frozen_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', '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': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'public_key': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'questions': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'private_key': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'public_key': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'questions': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'registration_starts_at': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}),
'result': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'result_proof': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'result': ('helios_auth.jsonfield.JSONField', [], {'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'}),
Expand All @@ -218,17 +218,17 @@ def backwards(self, orm):
},
'helios.trustee': {
'Meta': {'object_name': 'Trustee'},
'decryption_factors': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'decryption_proofs': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'decryption_factors': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'decryption_proofs': ('helios_auth.jsonfield.JSONField', [], {'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': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'public_key': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'pok': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'public_key': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'public_key_hash': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'secret': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'secret_key': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'secret_key': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'uuid': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'helios.voter': {
Expand All @@ -239,7 +239,7 @@ def backwards(self, orm):
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True'}),
'uuid': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'vote': ('auth.jsonfield.JSONField', [], {'null': 'True'}),
'vote': ('helios_auth.jsonfield.JSONField', [], {'null': 'True'}),
'vote_hash': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
'voter_id': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'voter_type': ('django.db.models.fields.CharField', [], {'max_length': '100'})
Expand Down
Loading

0 comments on commit afe8597

Please sign in to comment.