From 7903b1302b35a31b3fcc05082f0c68784c757d9e Mon Sep 17 00:00:00 2001 From: dpage Date: Wed, 11 Jun 2008 14:18:47 +0000 Subject: [PATCH] Fix listing of group roles in the combo box on privilege panels. git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7368 a7884b65-44f6-0310-8a51-81a127f17b15 --- CHANGELOG | 4 +++- pgadmin/dlg/dlgProperty.cpp | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 858d81847..9e3915919 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,7 +36,9 @@ Changes Date Dev Ver Change details ---------- --- ----- -------------- -2008-06-10 DP 1.8.5 Reverse engineer multi-word type names correctly when +2008-06-11 DP 1.8.5 Fix listing of group roles in the combo box on privilege + panels. +2008-06-10 DP 1.8.5 Reverse engineer multi-word type names correctly when quoting. 2008-06-04 DP 1.8.4 Fix potential crash bug in the query tool logging code, per Erwin. diff --git a/pgadmin/dlg/dlgProperty.cpp b/pgadmin/dlg/dlgProperty.cpp index 0401018fa..72815beae 100644 --- a/pgadmin/dlg/dlgProperty.cpp +++ b/pgadmin/dlg/dlgProperty.cpp @@ -447,7 +447,7 @@ void dlgProperty::AddUsers(ctlComboBoxFix *cb1, ctlComboBoxFix *cb2) { if (connection->BackendMinimumVersion(8, 1)) { - FillCombobox(wxT("SELECT rolname FROM pg_roles ORDER BY 1"), cb1, cb2); + FillCombobox(wxT("SELECT rolname FROM pg_roles WHERE rolcanlogin ORDER BY 1"), cb1, cb2); } else { @@ -1379,9 +1379,6 @@ void dlgSecurityProperty::AddGroups(ctlComboBox *comboBox) if (!((securityPage && securityPage->cbGroups) || comboBox)) return; - if (connection->BackendMinimumVersion(8, 1)) - return; - pgSet *set=connection->ExecuteSet(wxT("SELECT groname FROM pg_group ORDER BY groname")); if (set) -- 2.39.5