Skip to content

WIP: Update to Django 1.11 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Imperat wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

WIP: Update to Django 1.11 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Django==1.9.7
django-admin-tools==0.7.2
Django==1.11.7
django-admin-tools==0.8.1
django-bootstrap==0.2.4
django-bootstrap3==7.0.1
Pillow==3.3.0
Expand Down
16 changes: 15 additions & 1 deletion untitled1/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,21 @@

TEMPLATE_DEBUG = True

TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')]
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]

STATICFILES_DIRS = (
os.path.join(BASE_DIR, "static"),
Expand Down
9 changes: 4 additions & 5 deletions untitled1/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import patterns, include, url, static
from django.conf.urls import include, url, static
from django.contrib import admin
from django.contrib.auth.models import User
import admin_tools.urls
Expand All @@ -24,21 +24,20 @@ class UserViewSet(viewsets.ModelViewSet):
router = routers.DefaultRouter()
router.register(r'users', UserViewSet)

urlpatterns = patterns(
'',
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^admin_tools/', include(admin_tools.urls)),
url(r'logic/', include(teamlogic_urls)),
url(r'^login/', views.autorisation),
url(r'^register/', views.register),
url(r'^survey', views.survey),
url(r'^survey', views.survey, name='survey'),
url(r'^register_attention/', views.register_attention),
url(r'^attention/(?P<id>[0-9]+)/', views.view_attention,
name='attention'),
url(r'^', include(carusele_urls)),
url(r'^api/', include('rest_framework.urls', namespace='rest_framework')),
url('^', include('django.contrib.auth.urls')),
)
]

from django.conf.urls.static import static
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
Expand Down