From 81824e5bfe42020df019c66261819eb06472bcd8 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Tue, 22 Sep 2015 17:00:03 +1000 Subject: [PATCH] Fix dddp.test.test_project URL config and options for MiniMongo collections. --- dddp/test/meteor_todos/meteor_todos.js | 12 +++++++++--- dddp/test/test_project/urls.py | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dddp/test/meteor_todos/meteor_todos.js b/dddp/test/meteor_todos/meteor_todos.js index 7e44016..10d00ca 100644 --- a/dddp/test/meteor_todos/meteor_todos.js +++ b/dddp/test/meteor_todos/meteor_todos.js @@ -1,8 +1,14 @@ if (Meteor.isClient) { // This code only runs on the client - Django = DDP.connect('http://'+window.location.hostname+':8000/'); - Tasks = new Mongo.Collection("django_todos.task", {"connection": Django}); - Django.subscribe('Tasks'); + options = {}; + if (__meteor_runtime_config__.hasOwnProperty('DDP_DEFAULT_CONNECTION_URL')) { + Django = Meteor; + } else { + Django = DDP.connect(window.location.protocol + '//'+window.location.hostname+':8000/'); + options.connection = Django; + } + Tasks = new Mongo.Collection("django_todos.task", options); + TaskSub = Django.subscribe('Tasks'); Template.body.helpers({ tasks: function () { return Tasks.find({}); diff --git a/dddp/test/test_project/urls.py b/dddp/test/test_project/urls.py index fc92be3..6547d18 100644 --- a/dddp/test/test_project/urls.py +++ b/dddp/test/test_project/urls.py @@ -1,6 +1,18 @@ +"""Django DDP test project - URL configuraiton.""" +import os.path + from django.conf import settings from django.conf.urls import patterns, include, url from django.contrib import admin +from dddp.views import MeteorView +import dddp.test + +app = MeteorView.as_view( + json_path=os.path.join( + os.path.dirname(dddp.test.__file__), + 'build', 'bundle', 'star.json' + ), +) urlpatterns = patterns('', # Examples: @@ -16,4 +28,6 @@ urlpatterns = patterns('', 'show_indexes': False, }, ), + # all remaining URLs routed to Meteor app. + url(r'^(?P.*)$', app), )