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

diff --git a/CHANGELOG b/CHANGELOG
index 858d818472026a5986c78446b7e14fefa400650a..9e3915919d4a73ca6ecdac824ea97b353de9ae96 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,7 +36,9 @@ Changes
 \r
 Date       Dev Ver    Change details\r
 ---------- --- -----  --------------\r
-2008-06-10 DP  1.8.5  Reverse engineer multi-word type names correctly when \r
+2008-06-11 DP  1.8.5  Fix listing of group roles in the combo box on privilege \r
+                      panels.\r
+2008-06-10 DP  1.8.5  Reverse engineer multi-word type names correctly when\r
                       quoting.\r
 2008-06-04 DP  1.8.4  Fix potential crash bug in the query tool logging code,\r
                       per Erwin.\r

diff --git a/pgadmin/dlg/dlgProperty.cpp b/pgadmin/dlg/dlgProperty.cpp
index 0401018fa969ead88d9ae0fca30967dc576c5d4b..72815beaebea67bbdc6f5f20b82e19ec2402a24e 100644 (file)
--- 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)