Skip to content
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.

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

Bump django-sitetree to 1.7.0 #2918

Merged
merged 6 commits into from
Mar 28, 2017
Merged
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
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ django-import-export==0.4.2
django-mptt==0.8.7
django-reversion==1.8.6
django-rq==0.9.0
django-sitetree==1.7.0
django-taggit==0.17.1
django-taggit-serializer==0.1.5
django-threadlocals==0.8
Expand All @@ -26,5 +27,4 @@ six>=1.9.0
sqlparse==0.1.16
Unidecode==0.04.18
tablib==0.11.2
git+https://github.com/idlesign/django-sitetree.git@a626559c39ff1e865cde3441c44f42864c648dfb
factory-boy
4 changes: 0 additions & 4 deletions src/ralph/settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ def only_true(request):

ROOT_URLCONF = 'ralph.urls.dev'

# Disable exception for the missing element in SiteTree
# https://github.com/idlesign/django-sitetree/pull/157/files
RAISE_ITEMS_ERRORS_ON_DEBUG = False

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
Expand Down
6 changes: 6 additions & 0 deletions src/ralph/urls/base.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
from django.conf import settings
from django.conf.urls import include, url
from rest_framework.authtoken import views
from sitetree.sitetreeapp import SiteTree # noqa

from ralph.admin import ralph_site as admin
from ralph.api import router

# monkey patch for sitetree until
# https://github.com/idlesign/django-sitetree/issues/226 will be discussed
# and resolved
SiteTree.current_app_is_admin = lambda self: False

# import custom urls from each api module
# notice that each module should have `urlpatters` variable defined
# (as empty list if there is any custom url)
Expand Down