Skip to content

Commit

Permalink
Django 2.1 support
Browse files Browse the repository at this point in the history
  • Loading branch information
kmmbvnr committed Aug 22, 2018
1 parent 54d1cad commit 1fc7952
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
6 changes: 2 additions & 4 deletions README.rst
Expand Up @@ -123,9 +123,7 @@ Please see `FAQ <https://github.com/kmmbvnr/django-viewflow/wiki/Pro-FAQ>`_ for
Latest changelog
================

1.2.5 2018-05-07
GIT VERSION
----------------

* Fix process desccription translation on django 2.0
* Fix process dumpdata on django 2.0
* [PRO] Frontend - fix page scroll on graph model open
* Django 2.1 support
6 changes: 2 additions & 4 deletions demo/urls.py
@@ -1,6 +1,4 @@
import django
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.auth import views as auth
from django.views import generic

Expand Down Expand Up @@ -38,8 +36,8 @@ def installed(self):
from material.frontend import urls as frontend_urls # NOQA

urlpatterns = [
url(r'^accounts/login/$', auth.login, name='login'),
url(r'^accounts/logout/$', auth.logout, name='logout'),
url(r'^accounts/login/$', auth.LoginView.as_view(), name='login'),
url(r'^accounts/logout/$', auth.LogoutView.as_view(), name='logout'),
url(r'^', include('demo.website')),
url(r'', include(frontend_urls)),
]
2 changes: 1 addition & 1 deletion viewflow/flow/views/actions.py
Expand Up @@ -238,7 +238,7 @@ def get_success_url(self):
"""Continue to the flow index or redirect according `?back` parameter."""
if 'back' in self.request.GET:
back_url = self.request.GET['back']
if not is_safe_url(url=back_url, host=self.request.get_host()):
if not is_safe_url(url=back_url, allowed_hosts={self.request.get_host()}):
back_url = '/'
return back_url

Expand Down
2 changes: 1 addition & 1 deletion viewflow/flow/views/task.py
Expand Up @@ -151,7 +151,7 @@ def get_success_url(self):
namespace=self.request.resolver_match.namespace)

back = self.request.GET.get('back', None)
if back and not is_safe_url(url=back, host=self.request.get_host()):
if back and not is_safe_url(url=back, allowed_hosts={self.request.get_host()}):
back = '/'

if '_continue' in self.request.POST and back:
Expand Down
2 changes: 1 addition & 1 deletion viewflow/frontend/views.py
Expand Up @@ -40,7 +40,7 @@ def get_success_url(self):
"""Continue to the flow index or redirect according `?back` parameter."""
if 'back' in self.request.GET:
back_url = self.request.GET['back']
if not is_safe_url(url=back_url, host=self.request.get_host()):
if not is_safe_url(url=back_url, allowed_hosts={self.request.get_host()}):
back_url = '/'
return back_url

Expand Down

0 comments on commit 1fc7952

Please sign in to comment.