[GRASS-SVN] r59328 - grass/trunk/gui/wxpython/web_services

[svn_grass at osgeo.org]

Author: turek
Date: 2014-03-25 06:30:59 -0700 (Tue, 25 Mar 2014)
New Revision: 59328

Modified:
   grass/trunk/gui/wxpython/web_services/widgets.py
Log:
wms: check for name collision of user defined server and default server

Modified: grass/trunk/gui/wxpython/web_services/widgets.py
===================================================================
--- grass/trunk/gui/wxpython/web_services/widgets.py	2014-03-25 13:17:11 UTC (rev 59327)
+++ grass/trunk/gui/wxpython/web_services/widgets.py	2014-03-25 13:30:59 UTC (rev 59328)
@@ -1092,6 +1092,11 @@
         for k, v in self.default_servers.iteritems():
             if k not in setts.iterkeys():
                 self.servers_to_add[k] = v
+            elif v != setts[k]:
+                GMessage(parent=self,
+                         message=_("There exists user defined server with same name "
+                                   "as a default server <%s>.\n"
+                                   "The user defined server was not overwritten.") % (k))
 
         if self.servers_to_add:
             self.AddSettings(self.servers_to_add)