Merge pull request #714 from fstagni/51_fixes2

[5.1] remove OwnerDN from RMS
DIRACGrid · Jun 19, 2023 · 32af025 · 32af025
2 parents e513dc6 + e094906
commit 32af025
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py
@@ -109,10 +109,10 @@ def web_getSelectionData(self):
         callback["operationType"] = reqtype
 
         # U S E R
-        if (result := self.reqClient.getDistinctValuesWeb("OwnerDN"))["OK"]:
+        if (result := self.reqClient.getDistinctValuesWeb("Owner"))["OK"]:
             owner = []
-            for dn in result["Value"]:
-                owner.append([dn])
+            for own in result["Value"]:
+                owner.append([own])
             if len(owner) < 2:
                 owner = [["Nothing to display"]]
         else:
@@ -177,7 +177,7 @@ def __prepareParameters(
             if value := list(json.loads(status)):
                 req["Status"] = value
             if value := list(json.loads(owner)):
-                req["OwnerDN"] = value
+                req["Owner"] = value
 
         if startDate:
             req["FromDate"] = startDate

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/RequestMonitor/classes/RequestMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/RequestMonitor/classes/RequestMonitor.js
@@ -76,7 +76,7 @@ Ext.define("DIRAC.RequestMonitor.classes.RequestMonitor", {
       name: "JobID",
     },
     {
-      name: "OwnerDN",
+      name: "Owner",
     },
     {
       name: "RequestID",
@@ -193,8 +193,8 @@ Ext.define("DIRAC.RequestMonitor.classes.RequestMonitor", {
           width: 60,
         },
       },
-      OwnerDN: {
-        dataIndex: "OwnerDN",
+      Owner: {
+        dataIndex: "Owner",
       },
       OperationType: {
         dataIndex: "OperationType",