Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions example/example/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
from django.conf.urls import patterns, include, url

from django.contrib import admin
admin.autodiscover()

urlpatterns = patterns('',
# Examples:
# url(r'^$', 'example.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
try:
from django.conf.urls import patterns, include, url

admin.autodiscover()

urlpatterns = patterns('',
# Examples:
# url(r'^$', 'example.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),

url(r'^admin/', include(admin.site.urls)),
)
url(r'^admin/', include(admin.site.urls)),
)
except ImportError:
from django.urls import path
urlpatterns = [
path('admin/', admin.site.urls)
]
2 changes: 1 addition & 1 deletion fsm_admin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-

__version__ = '1.2.5'
__version__ = '1.2.6'
__author__ = 'G Adventures'
10 changes: 8 additions & 2 deletions fsm_admin/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@

from django.conf import settings
from django.contrib import messages
from django.utils.translation import ugettext as _
from django.utils.encoding import force_text
try:
from django.utils.translation import ugettext as _
from django.utils.encoding import force_text
except ImportError:
from django.utils.translation import gettext as _
from django.utils.encoding import force_str as force_text


from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
from django.http import HttpResponseRedirect

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=1.6
django-fsm==2.0.1
django-fsm>=2
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import fsm_admin

readme = open("README.rst").read()
requirements_txt = open('requirements.txt').read()

setup(
name="django-fsm-admin",
Expand All @@ -18,11 +19,7 @@
author_email="[email protected]",
url="https://github.com/gadventures/django-fsm-admin",
packages=find_packages(),
include_package_data=True,
install_requires=[
"Django>=1.6",
"django-fsm>=2.1.0",
],
install_requires=requirements_txt.splitlines(False),
keywords="django fsm admin",
license="MIT",
platforms=["any"],
Expand Down