misc: remove django-reversion dependency (#41641)
This commit is contained in:
parent
43c19c2a67
commit
f9f922656c
|
@ -12,7 +12,6 @@ Depends: ${misc:Depends}, ${python3:Depends},
|
||||||
python3-gadjo,
|
python3-gadjo,
|
||||||
python3-requests (>= 2.11),
|
python3-requests (>= 2.11),
|
||||||
python3-django-haystack (>= 2.4.0),
|
python3-django-haystack (>= 2.4.0),
|
||||||
python3-django-reversion (>= 2.0.12),
|
|
||||||
python3-django-taggit (>= 0.17.4),
|
python3-django-taggit (>= 0.17.4),
|
||||||
libjs-pdf (<< 1.1)
|
libjs-pdf (<< 1.1)
|
||||||
Recommends: python3-django-mellon
|
Recommends: python3-django-mellon
|
||||||
|
|
|
@ -3,5 +3,4 @@ gadjo
|
||||||
django-select2
|
django-select2
|
||||||
-e git+https://git.entrouvert.org/debian/django-ckeditor.git#egg=django_ckeditor
|
-e git+https://git.entrouvert.org/debian/django-ckeditor.git#egg=django_ckeditor
|
||||||
django-haystack
|
django-haystack
|
||||||
django-reversion
|
|
||||||
django-taggit
|
django-taggit
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -112,7 +112,6 @@ setup(
|
||||||
'gadjo',
|
'gadjo',
|
||||||
'django-ckeditor<4.5.4',
|
'django-ckeditor<4.5.4',
|
||||||
'django-haystack<2.8',
|
'django-haystack<2.8',
|
||||||
'django-reversion>=2.0,<3',
|
|
||||||
'django-taggit',
|
'django-taggit',
|
||||||
'djangorestframework>=3.3, <3.8',
|
'djangorestframework>=3.3, <3.8',
|
||||||
'requests',
|
'requests',
|
||||||
|
|
|
@ -19,11 +19,9 @@ from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from ckeditor.fields import RichTextField
|
from ckeditor.fields import RichTextField
|
||||||
import reversion
|
|
||||||
from taggit.managers import TaggableManager
|
from taggit.managers import TaggableManager
|
||||||
|
|
||||||
|
|
||||||
@reversion.register
|
|
||||||
class Page(models.Model):
|
class Page(models.Model):
|
||||||
title = models.CharField(_('Title'), max_length=200)
|
title = models.CharField(_('Title'), max_length=200)
|
||||||
slug = models.SlugField(_('Slug'))
|
slug = models.SlugField(_('Slug'))
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
<h2>{% trans 'Knowledge Base' %} - {{ object.title }}</h2>
|
<h2>{% trans 'Knowledge Base' %} - {{ object.title }}</h2>
|
||||||
{% if can_manage %}
|
{% if can_manage %}
|
||||||
<a rel="popup" href="{% url 'kb-page-delete' slug=object.slug %}">{% trans 'Delete' %}</a>
|
<a rel="popup" href="{% url 'kb-page-delete' slug=object.slug %}">{% trans 'Delete' %}</a>
|
||||||
<a href="{% url 'kb-page-history' slug=object.slug %}">{% trans 'History' %}</a>
|
|
||||||
<a href="{% url 'kb-page-edit' slug=object.slug %}">{% trans 'Edit' %}</a>
|
<a href="{% url 'kb-page-edit' slug=object.slug %}">{% trans 'Edit' %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
{% extends "kb/page_detail.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block appbar %}
|
|
||||||
<h2>{% trans 'Knowledge Base' %} - {{ object.title }}</h2>
|
|
||||||
<a href="{% url 'kb-page-view' slug=object.slug %}">{% trans 'Back to page' %}</a>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block breadcrumb %}
|
|
||||||
{{ block.super }}
|
|
||||||
<a href=".">{% trans 'History' %}</a>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div id="page-history">
|
|
||||||
<ul>
|
|
||||||
{% for version in versions_list %}
|
|
||||||
<li>{{ version.revision.date_created }}, <a href="{% url 'kb-page-version' slug=object.slug version=version.id %}">{% trans 'view' %}</a></li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
|
|
@ -1,26 +0,0 @@
|
||||||
{% extends "kb/page_detail.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block appbar %}
|
|
||||||
<h2>{% trans 'Knowledge Base' %} - {{ object.title }}</h2>
|
|
||||||
<a href="{% url 'kb-page-view' slug=object.slug %}">{% trans 'Back to page' %}</a>
|
|
||||||
<a href="{% url 'kb-page-history' slug=object.slug %}">{% trans 'History' %}</a>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="old-version warning-notice">
|
|
||||||
<p>
|
|
||||||
{% trans 'Warning: this is an old version of this page.' %}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<form method="POST">
|
|
||||||
{% csrf_token %}
|
|
||||||
<button>{% trans 'Revert to this version' %}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{block.super}}
|
|
||||||
|
|
||||||
{% endblock %}
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ from django.views.generic import (DetailView, CreateView, UpdateView,
|
||||||
from haystack.forms import SearchForm
|
from haystack.forms import SearchForm
|
||||||
from haystack.generic_views import SearchView
|
from haystack.generic_views import SearchView
|
||||||
from haystack.query import SearchQuerySet
|
from haystack.query import SearchQuerySet
|
||||||
from reversion.models import Version
|
|
||||||
from taggit.models import Tag
|
from taggit.models import Tag
|
||||||
|
|
||||||
from .models import Page
|
from .models import Page
|
||||||
|
@ -134,44 +133,6 @@ class PageSearchView(SearchView):
|
||||||
page_search = login_required(PageSearchView.as_view())
|
page_search = login_required(PageSearchView.as_view())
|
||||||
|
|
||||||
|
|
||||||
class PageHistoryView(DetailView):
|
|
||||||
model = Page
|
|
||||||
template_name = 'kb/page_history.html'
|
|
||||||
|
|
||||||
def dispatch(self, request, *args, **kwargs):
|
|
||||||
check_request_perms(request)
|
|
||||||
return super(PageHistoryView, self).dispatch(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
|
||||||
context = super(PageHistoryView, self).get_context_data(**kwargs)
|
|
||||||
context['versions_list'] = Version.objects.get_for_object(self.get_object())
|
|
||||||
return context
|
|
||||||
|
|
||||||
page_history = login_required(PageHistoryView.as_view())
|
|
||||||
|
|
||||||
|
|
||||||
class PageVersionView(DetailView):
|
|
||||||
model = Page
|
|
||||||
template_name = 'kb/page_version.html'
|
|
||||||
|
|
||||||
def dispatch(self, request, *args, **kwargs):
|
|
||||||
check_request_perms(request)
|
|
||||||
return super(PageVersionView, self).dispatch(request, *args, **kwargs)
|
|
||||||
|
|
||||||
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
|
|
||||||
self.kwargs.get('version')
|
|
||||||
return context
|
|
||||||
|
|
||||||
def post(self, request, *args, **kwargs):
|
|
||||||
version = Version.objects.get(id=self.kwargs.get('version'))
|
|
||||||
version.revision.revert()
|
|
||||||
return HttpResponseRedirect(self.get_object().get_absolute_url())
|
|
||||||
|
|
||||||
page_version = login_required(PageVersionView.as_view())
|
|
||||||
|
|
||||||
|
|
||||||
class KbZone(TemplateView):
|
class KbZone(TemplateView):
|
||||||
template_name = 'kb/zone.html'
|
template_name = 'kb/zone.html'
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@ INSTALLED_APPS = (
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'ckeditor',
|
'ckeditor',
|
||||||
'haystack',
|
'haystack',
|
||||||
'reversion',
|
|
||||||
'taggit',
|
'taggit',
|
||||||
'welco.sources.counter',
|
'welco.sources.counter',
|
||||||
'welco.sources.mail',
|
'welco.sources.mail',
|
||||||
|
@ -61,7 +60,6 @@ MIDDLEWARE = (
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'reversion.middleware.RevisionMiddleware',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
ROOT_URLCONF = 'welco.urls'
|
ROOT_URLCONF = 'welco.urls'
|
||||||
|
|
|
@ -53,8 +53,6 @@ urlpatterns = [
|
||||||
url(r'^ajax/kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail_fragment, name='kb-page-fragment'),
|
url(r'^ajax/kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail_fragment, name='kb-page-fragment'),
|
||||||
url(r'^kb/(?P<slug>[\w-]+)/edit$', welco.kb.views.page_edit, name='kb-page-edit'),
|
url(r'^kb/(?P<slug>[\w-]+)/edit$', welco.kb.views.page_edit, name='kb-page-edit'),
|
||||||
url(r'^kb/(?P<slug>[\w-]+)/delete$', welco.kb.views.page_delete, name='kb-page-delete'),
|
url(r'^kb/(?P<slug>[\w-]+)/delete$', welco.kb.views.page_delete, name='kb-page-delete'),
|
||||||
url(r'^kb/(?P<slug>[\w-]+)/history$', welco.kb.views.page_history, name='kb-page-history'),
|
|
||||||
url(r'^kb/(?P<slug>[\w-]+)/version/(?P<version>\w+)/$', welco.kb.views.page_version, name='kb-page-version'),
|
|
||||||
|
|
||||||
url(r'^ajax/contacts$', welco.contacts.views.zone, name='contacts-zone'),
|
url(r'^ajax/contacts$', welco.contacts.views.zone, name='contacts-zone'),
|
||||||
url(r'^contacts/search/json/$', welco.contacts.views.search_json, name='contacts-search-json'),
|
url(r'^contacts/search/json/$', welco.contacts.views.search_json, name='contacts-search-json'),
|
||||||
|
|
Loading…
Reference in New Issue