diff options
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/migrations.py | 2 | ||||
| -rw-r--r-- | mediagoblin/db/util.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 53df7954..972908be 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -404,7 +404,7 @@ class MediaReport_v0(ReportBase_v0): __mapper_args__ = {'polymorphic_identity': 'media_report'} id = Column('id',Integer, ForeignKey('core__reports.id'), primary_key=True) - media_entry_id = Column(Integer, ForeignKey(MediaEntry.i + media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False) class ArchivedReport_v0(ReportBase_v0): __tablename__ = 'core__reports_archived' diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 2a99d467..31fc49fb 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -77,8 +77,9 @@ def user_privileges_to_dictionary(user_id): privilege_dictionary = {} user = User.query.get(user_id) users_privileges = [p_item.privilege_name for p_item in user.all_privileges] - for privilege_name in FOUNDATIONS[Privilege]: - privilege_name = privilege_name[0] + #TODO update this to account for plugins that may add foundations + for privilege in FOUNDATIONS[Privilege]: + privilege_name = privilege['privilege_name'] if privilege_name in users_privileges: privilege_dictionary[privilege_name]=True else: |