From bc6352f5961673fe43ac4297280da87d372b61a5 Mon Sep 17 00:00:00 2001 From: dpage Date: Thu, 1 Oct 2009 13:43:56 +0000 Subject: [PATCH] Fix a couple of minor Slony issues. git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8058 a7884b65-44f6-0310-8a51-81a127f17b15 --- pgadmin/slony/dlgRepNode.cpp | 5 +++-- pgadmin/slony/dlgRepSet.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pgadmin/slony/dlgRepNode.cpp b/pgadmin/slony/dlgRepNode.cpp index 6d94fcc26..8cbf26856 100644 --- a/pgadmin/slony/dlgRepNode.cpp +++ b/pgadmin/slony/dlgRepNode.cpp @@ -112,8 +112,9 @@ wxString dlgRepNode::GetSql() sql += wxT(", ") + qtDbString(txtComment->GetValue()); - // if cluster->GetClusterVersion() - sql += wxT(", false"); + // The spool parameter was removed for Slony 2.0 + if (!cluster->ClusterMinimumVersion(2, 0)) + sql += wxT(", false"); sql += wxT(");\n"); diff --git a/pgadmin/slony/dlgRepSet.cpp b/pgadmin/slony/dlgRepSet.cpp index 71c79ec5f..ecbed824b 100644 --- a/pgadmin/slony/dlgRepSet.cpp +++ b/pgadmin/slony/dlgRepSet.cpp @@ -54,6 +54,7 @@ int dlgRepSet::Go(bool modal) txtID->SetValue(NumToStr(set->GetSlId())); txtID->Disable(); txtOrigin->SetValue(IdAndName(set->GetOriginId(), set->GetOriginNode())); + txtComment->Disable(); } else { @@ -91,7 +92,7 @@ void dlgRepSet::CheckChange() } else { - bool enable=true; + bool enable=(!txtComment->IsEmpty()); EnableOK(enable); } -- 2.39.5