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

diff --combined manifoldapi/static/js/manifold.js
index fe76629,d96deed..178108d
--- 1/manifoldapi/static/js/manifold.js
--- 2/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@@ -320,13 -320,12 +320,13 @@@ function QueryStore() 
          var self = this;
          var query_ext = this.find_analyzed_query_ext(query_uuid);
          var record_key = manifold.metadata.get_key(query_ext.query.object);
 +
          $.each(records, function(i, record) {
 -            var key = manifold.metadata.get_key(query_ext.query.object);
 +            //var key = manifold.metadata.get_key(query_ext.query.object);
              // ["start_time", "resource", "end_time"]
              // ["urn"]
 -            
              var record_key_value = manifold.record_get_value(record, record_key);
 +            
              query_ext.records.put(record_key_value, record);
  
              if (!(query_ext.state.get(record_key_value)))
@@@ -463,7 -462,7 +463,7 @@@
      {
          var query_ext = this.find_analyzed_query_ext(query_uuid);
          query_ext.filters = $.grep(query_ext.filters, function(x) {
-             return x == filter;
+             return x != filter;
          });
  
          this.apply_filters(query_uuid);
@@@ -1833,6 -1832,7 +1833,7 @@@ case TYPE_LIST_OF_VALUES
              // FILTERS
  
              case FILTER_ADDED: 
+                 console.log("FILTER ADDED", data);
                  /* Update internal record state */
                  manifold.query_store.add_filter(query_uuid, data);
  
@@@ -1842,6 -1842,7 +1843,7 @@@
                  break;
  
              case FILTER_REMOVED:
+                 console.log("FILTER REMOVED", data);
                  /* Update internal record state */
                  manifold.query_store.remove_filter(query_uuid, data);
  

diff --combined portal/slicerequestview.py
index bd711d5,598aca3..e81602a
--- 1/portal/slicerequestview.py
--- 2/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@@ -34,6 -34,7 +34,7 @@@ class SliceRequestView (LoginRequiredAu
          slice_name =''
          purpose=''
          exp_url=''
+         authority_hrn = None
          # Retrieve the list of authorities
          authorities_query = Query.get('authority').select('name', 'authority_hrn')
          authorities = execute_admin_query(wsgi_request, authorities_query)
@@@ -98,7 -99,7 +99,7 @@@
                      authority_hrn = authority['authority_hrn']
  
              # Handle the case when the template uses only hrn and not name
-             if not authority_hrn:
+             if authority_hrn is None:
                  authority_hrn = wsgi_request.POST.get('org_name', '')
  
              slice_request = {
@@@ -170,7 -171,7 +171,7 @@@
              'exp_url': exp_url,
              'pi': pi,
              'authority_name': authority_name,        
 -            'authority_hrn': user_authority,        
 +            'authority_hrn': user_authority,
              'cc_myself': True,
              'authorities': authorities,
              'theme': self.theme,

diff --combined portal/templates/slice-resource-view.html
index 6b7fa4c,3355e0c..626b7f5
--- 1/portal/templates/slice-resource-view.html
--- 2/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@@ -47,7 -47,7 +47,7 @@@ $(document).ready(function() 
                </div>
        
                <div class="row">
-                       <div class="col-md-4">
+                       <div class="col-md-6">
                                {{ filter_status }}
                        </div>
                        <div class="col-md-2">
@@@ -68,7 -68,6 +68,7 @@@
                        <ul class="nav nav-tabs">
                          <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="#resourceflowspace" role="tab" data-toggle="tab">Flowspace</a></li>
                          <li> <a href="#resourcescheduler" role="tab" data-toggle="tab">Scheduler</a></li>
                        </ul>
                        </div>
@@@ -106,12 -105,7 +106,12 @@@
                        {{map_resources}}
                                </div>
                                <div class="tab-pane" id="resourcescheduler">
 -                      {{scheduler}}
 +                    {{scheduler}}
 +                              </div>
 +                              <div class="tab-pane" id="resourceflowspace">
 +                        {{resources}}
 +                        {{flowspaces}}
 +                        {{flowspaces_form}}
                                </div>
        
                                <!--