From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 23 Nov 2015 17:22:37 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=75b26254fbc898b1adb7aab4eb654b2ef5dcb375;hp=-c;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

75b26254fbc898b1adb7aab4eb654b2ef5dcb375
diff --combined manifoldapi/static/js/manifold.js
index 98e56853,b8bd502d..d0d314ea
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@@ -1702,9 -1702,10 +1702,10 @@@ case TYPE_LIST_OF_VALUES
          var query, data;
  
          query = query_ext.query;
- 
-         var testbeds_with_sla = localStorage.getItem("sla_testbeds").split(",");
- 
+         var testbeds_with_sla = Array();
+         if(localStorage.getItem("sla_testbeds")!=null){
+             testbeds_with_sla = localStorage.getItem("sla_testbeds").split(",");
+         }
          switch(query.object) {
  
              case 'resource':
@@@ -1714,7 -1715,7 +1715,7 @@@
                  // 
                  // +) If a reservable node is added to the slice, then it should have a corresponding lease
                  // XXX Not always a resource
 -                var is_reservable = (record.exclusive == true);
 +                var is_reservable = (record.exclusive == 'true');
                  if (is_reservable) {
                      // var warnings = manifold.query_store.get_record_state(query.query_uuid, record_key, STATE_WARNINGS);