commit 279c4c653e47d7fa3bed2e1ae745c974627b562b
author Scott Baker <smbaker@gmail.com> Mon Dec 22 08:32:02 2014 -0800
committer Scott Baker <smbaker@gmail.com> Mon Dec 22 08:32:02 2014 -0800
tree 9dcdeb55a884b7fbc90c04e6ad97ff8e5a170678
parent 97a71c3c0efb4ad865093ce5def9a1375d406024
parent 92b1dbfde6303852ad8ce04f060452d958377870

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

opencloud.spec

diff --git a/opencloud.spec b/opencloud.spec
index 7fe1605..412a3f3 100644
--- a/opencloud.spec
+++ b/opencloud.spec
@@ -31,7 +31,7 @@
 
 %pre
 pip-python install django==1.7
-pip-python install djangorestframework
+pip-python install djangorestframework==2.4.4
 pip-python install markdown  # Markdown support for the browseable API.
 pip-python install pyyaml    # YAML content-type support.
 pip-python install django-filter  # Filtering support

planetstack/core/xoslib/static/js/xoslib/xos-backbone.js

diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
index b0ee0dc..0651709 100644
--- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -361,11 +361,11 @@
             }
         }
 
-        if (xosdefaults && xosdefaults[modelName]) {
+        if ((typeof xosdefaults !== "undefined") && xosdefaults[modelName]) {
             modelAttrs["defaults"] = xosdefaults[modelName];
         }
 
-        if (xosvalidators && xosvalidators[modelName]) {
+        if ((typeof xosvalidators !== "undefined") && xosvalidators[modelName]) {
             modelAttrs["validators"] = xosvalidators[modelName];
         }