Lift out a new add-on "aldryn-reversion", which is now in a separate …

…repo
divio · Feb 25, 2015 · f60f3da · f60f3da
1 parent 1a46e2e
commit f60f3da
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 303 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -15,10 +15,10 @@ modification, are permitted provided that the following conditions are met:
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL DIVIO AG BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+DISCLAIMED. IN NO EVENT SHALL DIVIO AG BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.rst b/README.rst
@@ -1,5 +1,6 @@
 |PyPI Version| |Build Status| |Coverage Status|
 
+===============
 Aldryn Newsblog
 ===============
 
@@ -13,6 +14,7 @@ Aldryn NewsBlog is intended to serve as a model of good practice for development
 of django CMS and Aldryn applications.
 
 
+--------------------
 Installation & Usage
 --------------------
 
@@ -32,14 +34,26 @@ Aldryn Platform Users
 Manual Installation
 ~~~~~~~~~~~~~~~~~~~
 
-1) Run `pip install aldryn-newsblog`.
+1) Run `pip install aldryn-newsblog`. Also note that a number of other packages
+   may need to be installed if they are not already: ::
+
+      aldryn-categories
+      aldryn-people
+      aldryn-reversion
+      djangocms-text-ckeditor
+      easy_thumbnails
+      django-filer
+      django-parler
+      django-reversion
+      taggit
 
 2) Add below apps to ``INSTALLED_APPS``: ::
 
     INSTALLED_APPS = [
         …
         'aldryn_categories',
         'aldryn_people',
+        'aldryn_reversion',
         'djangocms_text_ckeditor',
         'easy_thumbnails',
         'filer',
@@ -68,6 +82,7 @@ Manual Installation
 
 4) (Re-)Start your application server.
 
+------------------
 Available settings
 ------------------
 
@@ -76,6 +91,8 @@ Available settings
  * ``ALDRYN_NEWSBLOG_PAGINATE_BY`` - the number of objects to show per page.
    Default value: ``10``.
 
+
+-----
 Notes
 -----
 

diff --git a/aldryn_newsblog/admin.py b/aldryn_newsblog/admin.py
@@ -4,8 +4,8 @@
 
 from aldryn_apphooks_config.admin import BaseAppHookConfig
 from aldryn_people.models import Person
+from aldryn_reversion.admin import VersionedPlaceholderAdminMixin
 
-from .versioning.admin import VersionedPlaceholderAdminMixin
 from . import models
 
 

diff --git a/aldryn_newsblog/models.py b/aldryn_newsblog/models.py
@@ -11,17 +11,17 @@
 from django.utils.translation import get_language, ugettext_lazy as _
 from django.contrib.auth.models import User
 
+from aldryn_categories.fields import CategoryManyToManyField
+from aldryn_people.models import Person
+from aldryn_reversion.core import version_controlled_content
 from cms.models.fields import PlaceholderField
 from cms.models.pluginmodel import CMSPlugin
-from aldryn_people.models import Person
+from djangocms_text_ckeditor.fields import HTMLField
 from filer.fields.image import FilerImageField
 from parler.models import TranslatableModel, TranslatedFields
-from aldryn_categories.fields import CategoryManyToManyField
 from taggit.managers import TaggableManager
-from djangocms_text_ckeditor.fields import HTMLField
 
 from .cms_appconfig import NewsBlogConfig
-from .versioning import version_controlled_content
 from .managers import RelatedManager
 
 

diff --git a/aldryn_newsblog/templates/reversion/confirm_reversion.html b/aldryn_newsblog/templates/reversion/confirm_reversion.html
diff --git a/aldryn_newsblog/tests/test_aldryn_newsblog.py b/aldryn_newsblog/tests/test_aldryn_newsblog.py
@@ -37,7 +37,7 @@
 from aldryn_search.helpers import get_request
 
 from aldryn_newsblog.models import Article, NewsBlogConfig
-from aldryn_newsblog.versioning import create_revision_with_placeholders
+from aldryn_reversion.core import create_revision_with_placeholders
 
 from . import TESTS_STATIC_ROOT
 

diff --git a/aldryn_newsblog/versioning/__init__.py b/aldryn_newsblog/versioning/__init__.py