diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py index cf8e56b4..23f65608 100644 --- a/symposion/proposals/models.py +++ b/symposion/proposals/models.py @@ -13,9 +13,8 @@ from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ValidationError -import reversion - from model_utils.managers import InheritanceManager +from reversion import revisions as reversion from symposion.markdown_parser import parse from symposion.conference.models import Section diff --git a/symposion/teams/admin.py b/symposion/teams/admin.py index 5175e302..1a27c7ee 100644 --- a/symposion/teams/admin.py +++ b/symposion/teams/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -import reversion +from reversion.admin import VersionAdmin from symposion.teams.models import Team, Membership @@ -8,7 +8,7 @@ admin.site.register(Team, prepopulated_fields={"slug": ("name",)}) -class MembershipAdmin(reversion.VersionAdmin): +class MembershipAdmin(VersionAdmin): list_display = ["team", "user", "state"] list_filter = ["team"] search_fields = ["user__username"] diff --git a/symposion/teams/models.py b/symposion/teams/models.py index ec4d5e45..774dfbd8 100644 --- a/symposion/teams/models.py +++ b/symposion/teams/models.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import Permission, User -import reversion +from reversion import revisions as reversion TEAM_ACCESS_CHOICES = [