virtualenv/web/res/patch/piston.diff
author verrierj
Wed, 04 Jan 2012 17:28:54 +0100
changeset 330 806188af5027
parent 56 125fc6df230d
permissions -rw-r--r--
Projects have an icon identical to one of the media they contain, if this icon is different from the default icon. Icons can be set using ./manage.py setprojecticon once icons have been added to contents.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     1
diff -r 278:c4b2d21db51a piston/models.py
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     2
@@ -118 +118 @@
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     3
    timestamp = models.IntegerField()
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     4
    is_approved = models.BooleanField(default=False)
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     5
56
125fc6df230d fusionner
cavaliet
parents: 22
diff changeset
     6
-   user = models.ForeignKey(User, null=True, blank=True, related_name='tokens')
22
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     7
+   user = models.ForeignKey(User, null=True, blank=True, related_name='piston_tokens')
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset
     8
    consumer = models.ForeignKey(Consumer)