Merge branch 'master' into feature/validate-other-laguages

wagtail · Oct 22, 2018 · bb65e19 · bb65e19
2 parents 4b430e8 + 425cbbb
commit bb65e19
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,90 @@ language: python
 cache: pip
 matrix:
   include:
-    - env: TOXENV=py34-dj111-postgres-wt2
+    # Django 1.11
+    # Wagtail 2.0
+    - env: TOXENV=py34-dj111-wt2
       python: 3.4
-    - env: TOXENV=py35-dj111-postgres-wt2
+    - env: TOXENV=py35-dj111-wt2
       python: 3.5
-    - env: TOXENV=py36-dj111-postgres-wt2
+    - env: TOXENV=py36-dj111-wt2
       python: 3.6
-    - env: TOXENV=py34-dj2-postgres-wt2
+
+    # Wagtail 2.1
+    - env: TOXENV=py34-dj111-wt21
+      python: 3.4
+    - env: TOXENV=py35-dj111-wt21
+      python: 3.5
+    - env: TOXENV=py36-dj111-wt21
+      python: 3.6
+
+    # Wagtail 2.2
+    - env: TOXENV=py34-dj111-wt22
+      python: 3.4
+    - env: TOXENV=py35-dj111-wt22
+      python: 3.5
+    - env: TOXENV=py36-dj111-wt22
+      python: 3.6
+
+    # Wagtail 2.3
+    - env: TOXENV=py34-dj111-wt23
       python: 3.4
-    - env: TOXENV=py35-dj2-postgres-wt2
+    - env: TOXENV=py35-dj111-wt23
+      python: 3.5
+    - env: TOXENV=py36-dj111-wt23
+      python: 3.6
+
+    # Django 2
+    # Wagtail 2.0
+    - env: TOXENV=py35-dj2-wt2
       python: 3.5
-    - env: TOXENV=py36-dj2-postgres-wt2
+    - env: TOXENV=py36-dj2-wt2
       python: 3.6
+    - env: TOXENV=py37-dj2-wt2
+      python: 3.7
+      sudo: true
+      dist: xenial
+
+    # Wagtail 2.1
+    - env: TOXENV=py35-dj2-wt21
+      python: 3.5
+    - env: TOXENV=py36-dj2-wt21
+      python: 3.6
+    - env: TOXENV=py37-dj2-wt21
+      python: 3.7
+      sudo: true
+      dist: xenial
+
+    # Wagtail 2.2
+    - env: TOXENV=py35-dj2-wt22
+      python: 3.5
+    - env: TOXENV=py36-dj2-wt22
+      python: 3.6
+    - env: TOXENV=py37-dj2-wt22
+      python: 3.7
+      sudo: true
+      dist: xenial
+
+    # Wagtail 2.3
+    - env: TOXENV=py35-dj2-wt23
+      python: 3.5
+    - env: TOXENV=py36-dj2-wt23
+      python: 3.6
+    - env: TOXENV=py37-dj2-wt23
+      python: 3.7
+      sudo: true
+      dist: xenial
+
+    # Django 2.1
+    # Wagtail 2.3
+    - env: TOXENV=py35-dj21-wt23
+      python: 3.5
+    - env: TOXENV=py36-dj21-wt23
+      python: 3.6
+    - env: TOXENV=py37-dj21-wt23
+      python: 3.7
+      sudo: true
+      dist: xenial
 
     # Flake 8
     - env: TOXENV=flake8
@@ -24,11 +96,14 @@ matrix:
     # wagtail dev
     - env: TOXENV=wagtaildev
       python: 3.6
+
 install:
   - pip install codecov tox
 script:
   - tox -e $TOXENV
 services:
   - postgresql
+addons:
+    postgresql: 9.6
 after_success:
   - codecov
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.0.4 (11-10-2018)
+------------------
+
+ - Fix: Add "?next=" to edit url to redirect back to the right tree after edit when `HIDE_TRANSLATION_TREES` is enabled.
+
 2.0.3 (09-10-2018)
 ------------------
 

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/docs/source/releases/2.0.4.rst b/docs/source/releases/2.0.4.rst
@@ -0,0 +1,13 @@
+================================
+Wagtailtrans 2.0.4 release notes
+================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Bugfixes
+~~~~~~~~
+
+- Add "?next=" to edit url to redirect back to the right tree after edit when `HIDE_TRANSLATION_TREES` is enabled.
diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -8,6 +8,7 @@ Release notes
 .. toctree::
     :maxdepth: 1
 
+    2.0.4
     2.0.3
     2.0.2
     2.0.1

diff --git a/setup.py b/setup.py
@@ -9,8 +9,8 @@
 from wagtailtrans import get_version  # noqa isort:skip
 
 sandbox_require = [
-    'Django>=2.0',
-    'Wagtail>=2.0',
+    'Django>=2.1',
+    'Wagtail>=2.3rc1',
     'psycopg2>=2.5.4',
     'djangorestframework>=3.7',
 ]
@@ -63,6 +63,8 @@
         'Framework :: Django',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Wagtail',
         'Topic :: Internet :: WWW/HTTP :: Site Management',
     ]
 )
diff --git a/src/wagtailtrans/__init__.py b/src/wagtailtrans/__init__.py
@@ -1,6 +1,6 @@
 default_app_config = 'wagtailtrans.apps.WagtailTransConfig'
 
-VERSION = (2, 0, 3, 'final')
+VERSION = (2, 0, 4, 'final')
 
 
 def get_version():

diff --git a/src/wagtailtrans/wagtail_hooks.py b/src/wagtailtrans/wagtail_hooks.py
@@ -147,8 +147,15 @@ def edit_in_language_items(page, page_perms, is_parent=False):
     )
 
     for prio, language_page in enumerate(other_languages):
+        edit_url = reverse('wagtailadmin_pages:edit', args=(language_page.pk,))
+        return_page = language_page.canonical_page or language_page
+        next_url = reverse('wagtailadmin_explore', args=(return_page.get_parent().pk,))
+
         yield widgets.Button(
             force_text(language_page.language),
-            reverse('wagtailadmin_pages:edit', args=(language_page.pk,)),
+            "{edit_url}?next={next_url}".format(
+                edit_url=edit_url,
+                next_url=next_url
+            ),
             priority=prio,
         )
diff --git a/tests/_sandbox/settings/base.py b/tests/_sandbox/settings/base.py
@@ -111,12 +111,6 @@
     }
 }
 
-if DATABASES['default']['ENGINE'] == 'sql_server.pyodbc':
-    DATABASES['default']['OPTIONS'] = {
-        'driver': 'SQL Server Native Client 11.0',
-        'MARS_Connection': 'True',
-    }
-
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,9 @@
 skipsdist = True
 usedevelop = True
 envlist =
-    py{34,35,36}-dj111-{postgres,mssql}-wt2,
-    py{34,35,36}-dj2-{postgres,mssql}-wt2,
+    py{34,35,36}-dj111-wt{2,21,22,23},
+    py{35,36,37}-dj2-wt{2,21,22,23},
+    py{35,36,37}-dj21-wt{23},
     wagtaildev,
     flake8,
 
@@ -12,23 +13,20 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 install_command = pip install -e ".[test]" -U {opts} {packages}
 commands =
     py.test --cov=wagtailtrans --cov-report=xml tests/
 deps =
     dj111: django>=1.11,<2.0
-    dj111-mssql: django-pyodbc-azure==1.11.0.0
     dj2: django>=2.0,<2.1
-    dj2-mssql: django-pyodbc-azure==2.0.1.0
+    dj21: django>=2.1,<2.2
     wt2: wagtail>=2.0,<2.1
+    wt21: wagtail>=2.1,<2.2
+    wt22: wagtail>=2.1,<2.2
+    wt23: wagtail>=2.3rc1,<2.4
 setenv =
     DJANGO_SETTINGS_MODULE=tests._sandbox.settings
-    # https://www.appveyor.com/docs/services-databases/#sql-server-2016
-    mssql: DATABASE_ENGINE=sql_server.pyodbc
-    mssql: DATABASE_HOST=(local)\SQL2016
-    mssql: DATABASE_NAME=master
-    mssql: DATABASE_USER=sa
-    mssql: DATABASE_PASS=Password12!
 
 [testenv:wagtaildev]
 basepython = python3.6