SVN Commit by dpage: r4294 - trunk/pgadmin3/src/slony

Author: dpage
Date: 2005-06-09 16:10:03 +0100 (Thu, 09 Jun 2005)
New Revision: 4294

Modified:
trunk/pgadmin3/src/slony/dlgRepCluster.cpp
Log:
Check the correct object for the cluster name.

Modified: trunk/pgadmin3/src/slony/dlgRepCluster.cpp
===================================================================
--- trunk/pgadmin3/src/slony/dlgRepCluster.cpp 2005-06-09 14:45:20 UTC (rev 4293)
+++ trunk/pgadmin3/src/slony/dlgRepCluster.cpp 2005-06-09 15:10:03 UTC (rev 4294)
@@ -617,7 +617,10 @@
(!slony1BaseScript.IsEmpty() && !slony1FunctionScript.IsEmpty() && !slony1XxidScript.IsEmpty()),
_("Slony-I creation scripts not available; only joining possible."));

- CheckValid(enable, !txtClusterName->GetValue().IsEmpty(), _("Please specify name."));
+ if (chkJoinCluster->GetValue())
+ CheckValid(enable, !cbClusterName->GetValue().IsEmpty(), _("Please select a cluster name."));
+ else
+ CheckValid(enable, !txtClusterName->GetValue().IsEmpty(), _("Please specify name."));

long nodeId = StrToLong(txtNodeID->GetValue());
CheckValid(enable, nodeId > 0, _("Please specify local node ID."));