Merge pull request DIRACGrid#534 from TaykYoku/integration

[v4r3-pre15] release, notes
TaykYoku · Aug 18, 2021 · d4bccf7 · d4bccf7
2 parents f49291d + 6cfa5a7
commit d4bccf7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/release.notes b/release.notes
@@ -1,5 +1,4 @@
-[v4r3-pre14]
-
+[v4r3-pre15]
 
 NEW: (#514) use default menu for fresh WebApp installation
 FIX: (#515) align VMDIRAC with ext6
@@ -33,6 +32,11 @@ CHANGE: (#467) rename README.md to README.rst
 FIX: (#466) fix selector of pilot stats
 FIX: (#465) return empty result instead error for no host request
 
+[v4r2p9]
+
+FIX: (#530) fix bug in application downtime
+FIX: (#529) fix SystemAdministrator selector
+
 [v4r2p8]
 
 FIX: (#525) fix SystemAdministrator selector, #519 issue

diff --git a/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py b/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
@@ -643,7 +643,7 @@ def web_ComponentLocation(self):
     hosts = []
     result = ComponentMonitoringClient().getHosts({}, False, False)
     if result['OK']:
-      hosts = result['Value']
+      hosts = [h['HostName'] for h in result['Value'] if h.get('HostName')]
 
     componentTypes = ['Services', 'Agents']
     componentTypes = self.get_arguments("ComponentType") or componentTypes

diff --git a/src/WebAppDIRAC/WebApp/static/core/js/core/App.js b/src/WebAppDIRAC/WebApp/static/core/js/core/App.js
@@ -273,7 +273,7 @@ Ext.define("Ext.dirac.core.App", {
       if (downtime) {
         var startDate = Date.parse(downtime.start);
         var start = startDate ? new Date(startDate) : null;
-        var endDate = Date.parse(downtime.start);
+        var endDate = Date.parse(downtime.end);
         var end = endDate ? new Date(endDate) : null;
 
         var message = "Sorry, " + app + " application is in downtime";

diff --git a/src/WebAppDIRAC/__init__.py b/src/WebAppDIRAC/__init__.py
@@ -25,7 +25,7 @@
   majorVersion = 4
   minorVersion = 3
   patchLevel = 0
-  preVersion = 14
+  preVersion = 15
 
   version = "v%sr%s" % (majorVersion, minorVersion)
   buildVersion = "v%dr%d" % (majorVersion, minorVersion)