diff options
| -rw-r--r-- | mediagoblin/db/migrations.py | 6 | ||||
| -rw-r--r-- | mediagoblin/moderation/tools.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 6e644c3a..7011d842 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -28,8 +28,8 @@ from migrate.changeset.constraint import UniqueConstraint from mediagoblin.db.extratypes import JSONEncoded from mediagoblin.db.migration_tools import RegisterMigration, inspect_table -from mediagoblin.db.models import (MediaEntry, Collection, User, - MediaComment, Privilege) +from mediagoblin.db.models import (MediaEntry, Collection, MediaComment, User, + Privilege) MIGRATIONS = {} @@ -506,7 +506,7 @@ class MediaReport_v0(ReportBase_v0): class UserBan_v0(declarative_base()): __tablename__ = 'core__user_bans' - user_id = Column('id',Integer, ForeignKey(User.id), nullable=False, + user_id = Column(Integer, ForeignKey(User.id), nullable=False, primary_key=True) expiration_date = Column(Date) reason = Column(UnicodeText, nullable=False) diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py index f519e5f3..e0337536 100644 --- a/mediagoblin/moderation/tools.py +++ b/mediagoblin/moderation/tools.py @@ -73,7 +73,7 @@ def take_punitive_actions(request, form, report, user): elif u'delete' in form.action_to_resolve.data and \ report.is_media_entry_report(): deleted_media = report.media_entry - Session.delete(deleted_media) + deleted_media.delete() form.resolution_content.data += \ u"\n{mod} deleted the media entry.".format( mod=request.user.username) |