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/?p=myslice.git;a=commitdiff_plain;h=75b26254fbc898b1adb7aab4eb654b2ef5dcb375;hp=edd95f44b75c82e5a887272a36d4d9d1542d62a3

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

diff --git a/activity/__init__.py b/activity/__init__.py
index be5779d9..4a7d5c30 100644
--- a/activity/__init__.py
+++ b/activity/__init__.py
@@ -67,12 +67,12 @@ def logWrite(request, action, message, objects = None):
         "facility"      : None,
         "testbed"       : None,
     }
-    
+   
     if objects is not None:
         for o in objects :
             if (o in log) :
                 log[o] = objects[o]
-    
+
     try :
         result = urllib2.urlopen(server, urllib.urlencode(log))
         logger.info("===============>> activity: {} <{}> {}".format(action, request.user,message))
diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js
index b8bd502d..d0d314ea 100644
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@ -1715,7 +1715,7 @@ case TYPE_LIST_OF_VALUES:
                 // 
                 // +) 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);
 
diff --git a/plugins/filter_status/static/js/filter_status.js b/plugins/filter_status/static/js/filter_status.js
index 7a301005..676d3ee1 100644
--- a/plugins/filter_status/static/js/filter_status.js
+++ b/plugins/filter_status/static/js/filter_status.js
@@ -121,6 +121,9 @@
             filter_status = this.dataset['status'];
             self.select_tab(filter_status);
 
+            // manifoldapi/static/js/manifold.js
+            // See this.apply_filters
+
             // ... and communicate the appropriate filters to the manager
             // NOTE: we use the manifold namespace for internal filters 
             if (self.prev_filter_status) {
diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index cbd8d1bd..0a5d65ed 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -33,7 +33,7 @@ $(document).ready(function() {
 		</div>
 	
 		<div class="row">
-			<div class="col-md-8">
+			<div class="col-md-9">
 				{{ filter_status }}
 			</div>
 			<div class="col-md-1">
@@ -55,7 +55,7 @@ $(document).ready(function() {
 			  <li class="active"><a href="#resourcelist" role="tab" data-toggle="tab">Table</a></li>
 			  <li> <a href="#resourcemap" role="tab" data-toggle="tab">Map</a></li>
 			  <li> <a href="#resourcescheduler" role="tab" data-toggle="tab">Scheduler</a></li>
-			  <!--<li> <a href="#resourcesasap" role="tab" data-toggle="tab">ASAP</a></li> -->
+			  <!-- <li> <a href="#resourcesasap" role="tab" data-toggle="tab">ASAP</a></li> -->
 			</ul>
 			</div>
 		</div>
@@ -94,9 +94,9 @@ $(document).ready(function() {
 				<div class="tab-pane" id="resourcescheduler">
 	                {{scheduler}}
 				</div>
-					<!-- <div class="tab-pane" id="resourcesasap">
+					<div class="tab-pane" id="resourcesasap">
 	                {{asap}}
-				</div> -->
+				</div>
 
 				<!--
 				<div id="reserved" class="tab-pane" style="height:370px;display:none;">
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index 1af56614..be351fbc 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -14,6 +14,7 @@ $(document).ready(function() {
     {% for platform in platforms %}
     // /sfa/Describe?hrn=onelab.upmc.projectx.slicex&platform[]={{platform}}&type=slice
     $.post("/sfa/Describe",{'hrn':'{{slicename}}', 'type':'slice', 'platform':['{{platform}}']}, function( data ) {
+        console.log(data);
         if('parsed' in data['{{platform}}'] && 'rspec' in data['{{platform}}']['parsed']){
             rspec = data['{{platform}}']['parsed']['rspec'];
             if('node' in rspec){
diff --git a/portal/templates/user_request_email.html b/portal/templates/user_request_email.html
index 0702a92a..204c2934 100644
--- a/portal/templates/user_request_email.html
+++ b/portal/templates/user_request_email.html
@@ -1,4 +1,4 @@
-<img src="{{current_site}}/static/img/{{theme.logo}}" width="80px">	
+<img src="{{current_site}}/static/img/{{theme.logo}}">	
 <br>
 <h1>NEW USER REQUEST</h1>
 <br>
diff --git a/rest/sfa_api.py b/rest/sfa_api.py
index b35fa35c..45e30a19 100644
--- a/rest/sfa_api.py
+++ b/rest/sfa_api.py
@@ -283,6 +283,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
                             # ListResources(slice_hrn)
                             api_options['geni_slice_urn'] = urn
                             result = server.ListResources([object_cred], api_options)
+                            logger.debug(result)
                             dict_result = xmltodict.parse(result['value'])
                         # else GetVersion = v3
                         else: