fixed naming for facility_name and testbed_name in QueryTable plugin

diff --git a/plugins/querytable/__init__.py b/plugins/querytable/__init__.py
index 2182e70..995e935 100644 (file)
--- a/plugins/querytable/__init__.py
+++ b/plugins/querytable/__init__.py
@@ -34,7 +34,8 @@ Current implementation makes the following assumptions
 """
 
     MAP = {
-        'network_hrn'   :   'Testbed',
+        'facility_name' :   'Facility',
+        'testbed_name'  :   'Testbed',
         'hostname'      :   'Resource name',
         'type'          :   'Type',
     }

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 4b9e546..7ddf300 100644 (file)
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -12,7 +12,8 @@ QUERYTABLE_BGCOLOR_REMOVED = 2;
 
     
     var QUERYTABLE_MAP = {
-        'Testbed': 'network_hrn',
+        'Facility': 'facility_name',
+        'Testbed': 'testbed_name',
         'Resource name': 'hostname',
         'Type': 'type',
     };

diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index 7f3c2d6..3fe521a 100644 (file)
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -60,7 +60,6 @@ class SliceResourceView (LoginRequiredView, ThemeView):
                 # RESOURCES
                 'resource.urn',
                 'resource.hostname', 'resource.type',
-                'resource.network_hrn',
                 # - The facility_name and testbed_name are required for the
                 #   testbeds plugin to properly work.
                 'resource.facility_name',