diff --git a/debian/control b/debian/control index 9e27d37..532652b 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Depends: ${misc:Depends}, ${python:Depends}, python-gadjo, python-requests, python-django-haystack (>= 2.4.0), + python-django-reversion (>= 2.0.12), python-django-taggit (>= 0.17.4), libjs-pdf Recommends: python-django-mellon diff --git a/setup.py b/setup.py index 976ffc9..b31d1ed 100644 --- a/setup.py +++ b/setup.py @@ -101,7 +101,7 @@ setup( 'gadjo', 'django-ckeditor<4.5.3', 'django-haystack', - 'django-reversion==1.8.7', + 'django-reversion>=2.0', 'django-taggit', 'requests', 'whoosh', diff --git a/welco/kb/views.py b/welco/kb/views.py index f30d72b..6c1f4a3 100644 --- a/welco/kb/views.py +++ b/welco/kb/views.py @@ -32,7 +32,6 @@ from haystack.forms import SearchForm from haystack.generic_views import SearchView from haystack.query import SearchQuerySet from reversion.models import Version -from reversion.revisions import default_revision_manager from taggit.models import Tag from .models import Page @@ -145,7 +144,7 @@ class PageHistoryView(DetailView): def get_context_data(self, **kwargs): context = super(PageHistoryView, self).get_context_data(**kwargs) - context['versions_list'] = default_revision_manager.get_for_object(self.get_object()) + context['versions_list'] = Version.objects.get_for_object(self.get_object()) return context page_history = login_required(PageHistoryView.as_view()) @@ -161,7 +160,7 @@ class PageVersionView(DetailView): def get_context_data(self, **kwargs): context = super(PageVersionView, self).get_context_data(**kwargs) - context['object'] = Version.objects.get(id=self.kwargs.get('version')).object_version.object + context['object'] = Version.objects.get(id=self.kwargs.get('version')).object self.kwargs.get('version') return context