Some more fixes

server/src/uds/auths/RegexLdap/Authenticator.py

@@ -43,7 +43,7 @@ import ldap
 import re
 import logging
 
-__updated__ = '2014-06-02'
+__updated__ = '2014-06-04'
 
 logger = logging.getLogger(__name__)
 
@@ -167,10 +167,8 @@ class RegexLdap(auths.Authenticator):
                     if srch is None:
                         continue
                     res.append(''.join(srch.groups()))
-                except Exception as e:
-                    logger.warn('Invalid regular expression')
-                    logger.debug(e)
-                    break
+                except:
+                    pass  # Ignore exceptions here
         return res
 
     def valuesDict(self):

server/src/uds/core/util/Storage.py

@@ -74,12 +74,20 @@ class Storage(object):
     def updateData(self, skey, data, attr1=None):
         self.saveData(skey, data, attr1)
 
-    def readData(self, skey):
+    def readData(self, skey, fromPickle=False):
         try:
             key = self.__getKey(skey)
             logger.debug('Accesing to {0} {1}'.format(skey, key))
             c = dbStorage.objects.get(pk=key)
-            return c.data.decode(Storage.CODEC)
+            val = c.data.decode(Storage.CODEC)
+
+            if fromPickle:
+                return val
+
+            try:
+                return val.decode('utf-8')  # Tries to encode in utf-8
+            except:
+                return val
         except dbStorage.DoesNotExist:
             logger.debug('key not found')
             return None
@@ -88,7 +96,7 @@ class Storage(object):
         return self.readData(skey)
 
     def getPickle(self, skey):
-        v = self.readData(skey)
+        v = self.readData(skey, True)
         if v is not None:
             v = cPickle.loads(v)
         return v

server/src/uds/static/adm/js/gui.coffee

@@ -112,6 +112,7 @@
   gui.notify = (message, type) ->
     gui.launchModal "<b class=\"text-" + type + "\">" + gettext("Message") + "</b>", "<span class=\"text-" + type + "\">" + message + "</span>",
       actionButton: " "
+      closeButton: '<button type="button" class="btn btn-default" data-dismiss="modal">Ok</button>'
 
     return
 
@@ -296,10 +297,13 @@
         rest.test type, fields, ((data) ->
           if data == 'ok'
             text = gettext("Test passed successfully")
+            kind = 'success'
           else
-            text = "<b class=\"text-danger\">Test failed: #{data}</b>"
-          gui.launchModal gettext("Test result"), text,
-            actionButton: " "
+            text = gettext("Test failed:") + " #{data}</b>"
+            kind = 'danger'
+          gui.notify text, kind
+          # gui.launchModal gettext("Test result"), text,
+          #  actionButton: " "
 
           return
         ), gui.failRequestModalFnc(gettext("Test error"))