CVS Commit by andreas: some server property changes not handled
require($_SERVER['DOCUMENT_ROOT']."/includes/top_config.php");
?>
CVS Commit by andreas: some server property changes not handled
Log Message:
-----------
some server property changes not handled correctly [Ted Taylor]
Modified Files:
--------------
pgadmin3/src/ui:
dlgServer.cpp (r1.10 -> r1.11)
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.10 -r1.11
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -155,22 +155,9 @@
if (server)
{
- if (connection)
- {
- pgSet *set=connection->ExecuteSet(
- wxT("SELECT datname FROM pg_database WHERE datallowconn ORDER BY datname"));
- if (set)
- {
- while (!set->Eof())
- {
- cbDatabase->Append(set->GetVal(0));
- set->MoveNext();
- }
- delete set;
- }
- }
- else
cbDatabase->Append(server->GetDatabaseName());
+ if (connection)
+ cbDatabase->Disable();
txtDescription->SetValue(server->GetDescription());
txtService->SetValue(server->GetServiceID());
@@ -185,18 +172,6 @@
else
{
SetTitle(_("Add server"));
-
-#if 0
- cbDatabase->Append(settings->GetLastDatabase());
-
- txtName->SetValue(settings->GetLastServer());
- txtDescription->SetValue(settings->GetLastDescription());
- txtPort->SetValue(NumToStr((long)settings->GetLastPort()));
- cbSSL->SetSelection(settings->GetLastSSL());
- cbDatabase->SetSelection(0);
- txtUsername->SetValue(settings->GetLastUsername());
- chkNeedPwd->SetValue(true);
-#endif
}
int rc=dlgProperty::Go(modal);
Home |
Main Index |
Thread Index