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 /rest_framework/authtoken/models.py | |
| parent | 44281c39961a7fd2131a516f905cd28c0c95efcc (diff) | |
| download | django-rest-framework-900c4b625b62a6c1f4a16bfe8d6b5d77480427ff.tar.bz2 | |
api_key -> auth_token to avoid TastyPie conflict
Diffstat (limited to 'rest_framework/authtoken/models.py')
| -rw-r--r-- | rest_framework/authtoken/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |