Merge pull request #6053 from manics/omero•web•client•settings

OMERO.web client settings override server client settings

components/tools/OmeroPy/src/omero/plugins/admin.py

@@ -1659,7 +1659,7 @@ def _check(msg, vers):
         vers = popen.communicate()[1]
         _check("icegridnode version", vers)
 
-    def open_config(self, unused):
+    def open_config(self, unused=None):
         """
         Callers are responsible for closing the
         returned ConfigXml object.

components/tools/OmeroWeb/omeroweb/webclient/webclient_gateway.py

@@ -50,6 +50,8 @@
 
 from omero.gateway import KNOWN_WRAPPERS
 
+from omero.plugins.admin import AdminControl
+
 from django.utils.encoding import smart_str
 from django.conf import settings
 
@@ -239,6 +241,21 @@ def chgrpDryRun(self, targetObjects, group_id):
     ##############################################
     #   IAdmin                                  ##
 
+    def getClientSettings(self):
+        """
+        Returns all client properties matching omero.client.*
+        Local config settings override client settings sent by the server
+        """
+        configmap = super(OmeroWebGateway, self).getClientSettings()
+        localcfg = AdminControl().open_config()
+        try:
+            for key in localcfg.keys():
+                if key.startswith('omero.client.'):
+                    configmap[key] = localcfg[key]
+            return configmap
+        finally:
+            localcfg.close()
+
     def getEmailSettings(self):
         """
         Retrieves a configuration value "omero.mail.config" from the backend