add compatibility with django 1.11

This commit is contained in:
Frédéric Péters 2018-12-26 11:12:25 +01:00
parent 206fb47322
commit e763d92c38
5 changed files with 43 additions and 19 deletions

View File

@ -1,11 +1,11 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import (ModulesView, ProjectDetailView, ProjectSummaryHistoryView,
ProjectHistoryView, ModuleDiffView, IssuesSnippet, ModuleIssuesView,
ModuleDeploymentsView, module_deployments_json, api_issues_json)
urlpatterns = patterns('',
urlpatterns = [
url(r'^modules/$', ModulesView.as_view(), name='modules-list'),
url(r'^(?P<slug>[\w,-]+)/$', ProjectDetailView.as_view(), name='project-view'),
url(r'^(?P<slug>[\w,-]+)/history$', ProjectSummaryHistoryView.as_view(), name='project-summary-history'),
@ -20,4 +20,4 @@ urlpatterns = patterns('',
url(r'^modules/(?P<name>[\w,-]+)/json$',
module_deployments_json, name='module-deployments-json'),
url(r'^api/issues/(?P<issue>\d+)/$', api_issues_json),
)
]

View File

@ -15,8 +15,6 @@ SECRET_KEY = 'k16cal%1fnochq4xbxqgdns-21lt9lxeof5*%j(0ief3=db32&'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
TEMPLATE_DEBUG = True
ALLOWED_HOSTS = []
# Application definition
@ -42,8 +40,8 @@ MIDDLEWARE_CLASSES = (
)
# Serve xstatic files, required for gadjo
STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \
('gadjo.finders.XStaticFinder',)
STATICFILES_FINDERS = list(global_settings.STATICFILES_FINDERS) + \
['gadjo.finders.XStaticFinder']
ROOT_URLCONF = 'scrutiny.urls'
@ -88,9 +86,27 @@ STATICFILES_DIRS = (
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
TEMPLATE_DIRS = (
os.path.join(BASE_DIR, 'scrutiny', 'templates'),
)
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [
os.path.join(BASE_DIR, 'scrutiny', 'templates'),
],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
],
},
},
]
REDMINE_REFERENCE_PLATFORM = 'SaaS2 / Test'

View File

@ -1,6 +1,5 @@
{% extends "scrutiny/base.html" %}
{% load i18n %}
{% load url from future %}
{% block page-title %}
Scrutiny

View File

@ -1,15 +1,24 @@
from django.conf.urls import patterns, include, url
from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.contrib.auth.views import logout_then_login
from django.contrib.auth.urls import urlpatterns as auth_urls
import scrutiny.views
from scrutiny.projects.urls import urlpatterns as projects_urls
admin.autodiscover()
urlpatterns = patterns('',
url(r'^$', 'scrutiny.views.home', name='home'),
url(r'^projects/', include('scrutiny.projects.urls')),
urlpatterns = [
url(r'^$', scrutiny.views.home, name='home'),
url(r'^projects/', include(projects_urls)),
url(r'^admin/', include(admin.site.urls)),
url(r'^accounts/logout/', 'django.contrib.auth.views.logout_then_login'),
url(r'^accounts/', include('django.contrib.auth.urls')),
)
url(r'^accounts/logout/', logout_then_login),
url(r'^accounts/', include(auth_urls)),
]
urlpatterns += staticfiles_urlpatterns()
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

View File

@ -42,7 +42,7 @@ setup(name='scrutiny',
scripts=['manage.py'],
include_package_data = True,
install_requires=[
'django >= 1.7, < 1.9',
'django >= 1.8, < 1.12',
'requests',
'gadjo',
],