diff --git a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py index 2230d0bf..459702e3 100644 --- a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py @@ -80,13 +80,13 @@ def web_getSelectionData(self): gridtype = [["Nothing to display"]] callback["gridtype"] = gridtype - if "OwnerGroup" in result and len(result["OwnerGroup"]) > 0: - ownerGroup = [] - for i in result["OwnerGroup"]: - ownerGroup.append([str(i)]) + if "VO" in result and len(result["VO"]) > 0: + VO = [] + for i in result["VO"]: + VO.append([str(i)]) else: - ownerGroup = [["Nothing to display"]] - callback["ownerGroup"] = ownerGroup + VO = [["Nothing to display"]] + callback["VO"] = VO if "DestinationSite" in result and len(result["DestinationSite"]) > 0: ce = [] @@ -159,9 +159,9 @@ def __request(self): if owner: req["Owner"] = owner - ownerGroup = list(json.loads(self.get_argument("ownerGroup", "[]"))) - if ownerGroup: - req["OwnerGroup"] = ownerGroup + VO = list(json.loads(self.get_argument("VO", "[]"))) + if VO: + req["VO"] = VO sort = json.loads(self.get_argument("sort", "[]")) if len(sort) > 0: @@ -211,8 +211,8 @@ def web_getStatisticsData(self, statsField): selector = "GridSite" elif statsField == "Computing Element": selector = "DestinationSite" - elif statsField == "Owner Group": - selector = "OwnerGroup" + elif statsField == "VO": + selector = "VO" else: selector = statsField diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js index f85a675d..042ba83d 100755 --- a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js +++ b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js @@ -145,9 +145,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { { name: "CPUTime", }, - { - name: "OwnerDN", - }, { name: "JobGroup", }, @@ -202,9 +199,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { name: "StatusIcon", mapping: "Status", }, - { - name: "OwnerGroup", - }, ], initComponent: function () { diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js index 477770c2..1e05ce0f 100755 --- a/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js +++ b/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js @@ -80,7 +80,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { name: "Status", }, { - name: "OwnerGroup", + name: "VO", }, { name: "LastUpdateTime", @@ -185,7 +185,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { site: "Site", status: "Status", computingElement: "Computing Element", - ownerGroup: "Owner Group", + VO: "VO", owner: "Owner", broker: "Broker", }; @@ -205,7 +205,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { ["site", "site"], ["status", "status"], ["computingElement", "computingElement"], - ["ownerGroup", "ownerGroup"], + ["VO", "VO"], ["owner", "owner"], ["broker", "broker"], ]; @@ -382,8 +382,8 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { hidden: true, }, }, - OwnerGroup: { - dataIndex: "OwnerGroup", + VO: { + dataIndex: "VO", }, PilotID: { dataIndex: "PilotID", @@ -452,7 +452,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { mode: "local", store: new Ext.data.ArrayStore({ fields: ["category"], - data: [["Status"], ["Site"], ["Computing Element"], ["Owner Group"], ["Owner"], ["Broker"]], + data: [["Status"], ["Site"], ["Computing Element"], ["VO"], ["Owner"], ["Broker"]], }), triggerAction: "all", value: "Status",