From f211f3482fe16ebedb1baba5ce23bf5c43a9b646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Mon, 11 Jun 2018 13:33:50 +0200
Subject: [PATCH] small fixes & added open link on new window instead of
 current

---
 server/src/uds/core/services/BaseDeployed.py       |  5 ++++-
 server/src/uds/core/workers/ServiceCacheUpdater.py |  1 -
 server/src/uds/templates/uds/html5/index.html      | 11 +++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/server/src/uds/core/services/BaseDeployed.py b/server/src/uds/core/services/BaseDeployed.py
index 529d99677..5d48d566d 100644
--- a/server/src/uds/core/services/BaseDeployed.py
+++ b/server/src/uds/core/services/BaseDeployed.py
@@ -36,7 +36,7 @@ from uds.core import Environmentable
 from uds.core import Serializable
 from uds.core.util.State import State
 
-__updated__ = '2018-06-07'
+__updated__ = '2018-06-11'
 
 
 class UserDeployment(Environmentable, Serializable):
@@ -139,6 +139,9 @@ class UserDeployment(Environmentable, Serializable):
         self._osmanager = kwargs.get('osmanager', None)
         self._dbService = kwargs.get('dbservice', None)
         self._uuid = kwargs.get('uuid', '')
+        # If it has dbService
+        if self._dbService:
+            self._uuid = self._dbService.uuid
 
         self.initialize()
 
diff --git a/server/src/uds/core/workers/ServiceCacheUpdater.py b/server/src/uds/core/workers/ServiceCacheUpdater.py
index ba2c3fd80..231c6858d 100644
--- a/server/src/uds/core/workers/ServiceCacheUpdater.py
+++ b/server/src/uds/core/workers/ServiceCacheUpdater.py
@@ -234,7 +234,6 @@ class ServiceCacheUpdater(Job):
         logger.debug('Starting cache checking')
         # We need to get
         servicesThatNeedsUpdate = self.servicesPoolsNeedingCacheUpdate()
-        logger.debug('**** Services That Needs Update: {}'.format(servicesThatNeedsUpdate))
         for sp, cacheL1, cacheL2, assigned in servicesThatNeedsUpdate:
             # We have cache to update??
             logger.debug("Updating cache for {0}".format(sp))
diff --git a/server/src/uds/templates/uds/html5/index.html b/server/src/uds/templates/uds/html5/index.html
index 2d32263d5..b9dbed396 100644
--- a/server/src/uds/templates/uds/html5/index.html
+++ b/server/src/uds/templates/uds/html5/index.html
@@ -297,6 +297,7 @@
 {% block js %}
         {% pageReloadTime as reloadTime %}
         <script>
+        var openedWindow = null;
         function getUrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -318,7 +319,10 @@
             if ( url.substring(0, 7) == 'udsa://' ) {
                 uds.launch($el);
             } else {
-                window.location = url;
+                if( openedWindow != null) {
+                    openedWindow.close();
+                }
+                openedWindow = window.open(url, 'uds_rds_mm');
             }
         }
 
@@ -361,7 +365,10 @@
                 if ( url.substring(0, 7) == 'udsa://' ) {
                     uds.launch(el);
                 } else {
-                    window.location = url;
+                        if( openedWindow != null) {
+                        openedWindow.close();
+                 }
+                 openedWindow = window.open(url, 'uds_rds_mm');
                 }
 
                 return false;