Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 11 Oct 2013 15:28:57 +0000 (17:28 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 11 Oct 2013 15:28:57 +0000 (17:28 +0200)
1  2 
portal/sliceview.py

diff --combined portal/sliceview.py
@@@ -51,8 -51,8 +51,8 @@@ class SliceView (LoginRequiredAutoLogou
          main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
          main_query.select(
                  'slice_hrn',
 -                'resource.resource_hrn', 'resource.hostname', 'resource.type', 
 -                #'resource.network_hrn',
 +                'resource.hrn', 'resource.hostname', 'resource.type', 
 +                'resource.network_hrn',
                  #'lease.urn',
                  'user.user_hrn',
                  #'application.measurement_point.counter'
              page  = page,
              query = query_resource_all,
              title = "Select Columns",
+             domid = 'select-columns',
              )
          resources_active_filters = ActiveFilters(
              page  = page,