Skip to content

Commit

Permalink
updates for wq.db 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sheppard committed Apr 20, 2015
1 parent f701623 commit 8f5b828
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions django_project/db/exampleapp/rest.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from wq.db.rest import app
from wq.db import rest
from wq.db.patterns import rest as patterns
from .models import Example


app.router.register_model(
rest.router.register_model(
Example,
serializer=patterns.IdentifiedModelSerializer
)
app.router.add_page('index', {'url': ''})
rest.router.add_page('index', {'url': ''})
4 changes: 2 additions & 2 deletions django_project/db/project_name/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
)

# wq: Recommended settings for Django, rest_framework, and social auth
from wq.db.rest.settings import (
from wq.db.default_settings import (
TEMPLATE_LOADERS,
TEMPLATE_CONTEXT_PROCESSORS,
SESSION_COOKIE_HTTPONLY,
Expand All @@ -64,7 +64,7 @@
)

# wq: Recommended settings unique to wq.db
from wq.db.rest.settings import (
from wq.db.default_settings import (
ANONYMOUS_PERMISSIONS,
SRID,
DEFAULT_AUTH_GROUP,
Expand Down
6 changes: 3 additions & 3 deletions django_project/db/project_name/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from django.contrib import admin
admin.autodiscover()

from wq.db.rest import app
app.autodiscover()
from wq.db import rest
rest.autodiscover()

urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'', include('social.apps.django_app.urls', namespace='social')),
url(r'^', include(app.router.urls))
url(r'^', include(rest.router.urls))
)
2 changes: 1 addition & 1 deletion django_project/templates/partials/csrf.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<input type="hidden" name="csrfmiddlewaretoken" value="{% templatetag openvariable %}csrftoken{% templatetag closevariable %}">
<input type="hidden" name="csrfmiddlewaretoken" value="{% templatetag openvariable %}csrf_token{% templatetag closevariable %}">

0 comments on commit 8f5b828

Please sign in to comment.