diff options
| author | Tom Christie | 2012-10-10 09:50:15 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-10 09:50:15 +0100 |
| commit | 900c4b625b62a6c1f4a16bfe8d6b5d77480427ff (patch) | |
| tree | fa5681db81af3c23cf9022d74c54c19f6584ab31 | |
| parent | 44281c39961a7fd2131a516f905cd28c0c95efcc (diff) | |
| download | django-rest-framework-900c4b625b62a6c1f4a16bfe8d6b5d77480427ff.tar.bz2 | |
api_key -> auth_token to avoid TastyPie conflict
| -rw-r--r-- | rest_framework/authtoken/migrations/0001_initial.py | 6 | ||||
| -rw-r--r-- | rest_framework/authtoken/models.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py index 99d9eab9..9d750381 100644 --- a/rest_framework/authtoken/migrations/0001_initial.py +++ b/rest_framework/authtoken/migrations/0001_initial.py @@ -11,7 +11,7 @@ class Migration(SchemaMigration): # Adding model 'Token' db.create_table('authtoken_token', ( ('key', self.gf('django.db.models.fields.CharField')(max_length=40, primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='api_key', unique=True, to=orm['auth.User'])), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm['auth.User'])), ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), )) db.send_create_signal('authtoken', ['Token']) @@ -56,7 +56,7 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'Token'}, 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'api_key'", 'unique': 'True', 'to': "orm['auth.User']"}) + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'auth_token'", 'unique': 'True', 'to': "orm['auth.User']"}) }, 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, @@ -67,4 +67,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['authtoken']
\ No newline at end of file + complete_apps = ['authtoken'] diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index f7e78ef3..5b3071aa 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -9,7 +9,7 @@ class Token(models.Model): The default authorization token model. """ key = models.CharField(max_length=40, primary_key=True) - user = models.OneToOneField('auth.User', related_name='api_key') + user = models.OneToOneField('auth.User', related_name='auth_token') created = models.DateTimeField(auto_now_add=True) def save(self, *args, **kwargs): |