ajurna/cbwebreader
1
0
Fork 0
mirror of https://github.com/ajurna/cbwebreader.git synced 2025-12-06 06:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

commented out explicit silk requirement

Browse Source
This commit is contained in:
Ajurna
2018-04-06 14:59:06 +01:00
parent 341385dadb
commit 5f6ce8a754
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cbreader/settings.py
View File

@@ -37,23 +37,11 @@ INSTALLED_APPS = (
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'silk',
'snowpenguin.django.recaptcha2', 'snowpenguin.django.recaptcha2',
'comic', 'comic',
'comic_auth', 'comic_auth',
) )
# MIDDLEWARE_CLASSES = (
# 'django.contrib.sessions.middleware.SessionMiddleware',
# 'django.middleware.common.CommonMiddleware',
# 'django.middleware.csrf.CsrfViewMiddleware',
# 'django.contrib.auth.middleware.AuthenticationMiddleware',
# 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
# 'django.contrib.messages.middleware.MessageMiddleware',
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
# 'django.middleware.security.SecurityMiddleware',
# 'silk.middleware.SilkyMiddleware',
# )
MIDDLEWARE = [ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
@@ -62,7 +50,7 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'silk.middleware.SilkyMiddleware', # 'silk.middleware.SilkyMiddleware',
] ]
ROOT_URLCONF = 'cbreader.urls' ROOT_URLCONF = 'cbreader.urls'
@@ -70,7 +58,7 @@ ROOT_URLCONF = 'cbreader.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'templates')], 'DIRS': ['templates'],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [

5
cbreader/urls.py
View File

@@ -14,6 +14,7 @@ Including another URLconf
2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) 2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
""" """
from django.conf.urls import include, url from django.conf.urls import include, url
from django.contrib import admin
import comic.views import comic.views
import comic_auth.views import comic_auth.views
@@ -24,6 +25,6 @@ urlpatterns = [
url(r'^logout/', comic_auth.views.comic_logout), url(r'^logout/', comic_auth.views.comic_logout),
url(r'^setup/', comic.views.initial_setup), url(r'^setup/', comic.views.initial_setup),
url(r'^comic/', include('comic.urls')), url(r'^comic/', include('comic.urls')),
# url(r'^admin/', include(admin.site.urls)), url(r'^admin/', admin.site.urls),
url(r'^silk/', include('silk.urls', namespace='silk')) # url(r'^silk/', include('silk.urls', namespace='silk'))
] ]