diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-06-10 16:48:45 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-06-10 16:48:45 -0500 |
| commit | 70bceff85fd678a7b6653b2bf377b075ebd11590 (patch) | |
| tree | 57c4a8d44aa3a9388098d2350bc97b1b6e19c1ee /mediagoblin/db/models.py | |
| parent | 1ec440b44614e8144b8244d28749e2f59d3e4126 (diff) | |
| parent | 9adef07e8f0d169e57776bcefc03f2ae17c8920e (diff) | |
| download | mediagoblin-70bceff85fd678a7b6653b2bf377b075ebd11590.tar.lz mediagoblin-70bceff85fd678a7b6653b2bf377b075ebd11590.tar.xz mediagoblin-70bceff85fd678a7b6653b2bf377b075ebd11590.zip | |
Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 8499ea3f..77bfe14e 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -877,13 +877,11 @@ class PrivilegeUserAssociation(Base): __tablename__ = 'core__privileges_users' - privilege_id = Column( - 'core__privilege_id', + user_id = Column( Integer, ForeignKey(User.id), primary_key=True) - user_id = Column( - 'core__user_id', + privilege_id = Column( Integer, ForeignKey(Privilege.id), primary_key=True) |