Ticket #164: ticket164_v1.patch

pgadmin/include/dlg/dlgProperty.h

@@ -112 +112 @@
     void OnChangeReadOnly(wxCommandEvent& event);
 
 protected:
+    void AddGroups(ctlComboBoxFix *comboBox=0);
     void AddUsers(ctlComboBoxFix *cb1, ctlComboBoxFix *cb2=0);
     void FillCombobox(const wxString &query, ctlComboBoxFix *cb1, ctlComboBoxFix *cb2=0);
     void PrepareTablespace(ctlComboBoxFix *cb, const OID current=0);

pgadmin/dlg/dlgExtTable.cpp

@@ -59 +59 @@
 {
     int returncode;
     
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     if (extTable)

pgadmin/dlg/dlgLanguage.cpp

@@ -60 +60 @@
     if (!connection->BackendMinimumVersion(7, 5))
         txtComment->Disable();
 
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
     if (!connection->BackendMinimumVersion(8, 3))
         cbOwner->Disable();

pgadmin/dlg/dlgProperty.cpp

@@ -306 +306 @@
     {
         if (!GetObject())
             cbOwner->Append(wxEmptyString);
+        AddGroups(cbowner);
         AddUsers(cbowner);
     }
     if (txtOid)
@@ -546 +547 @@
 }
 
 
+void dlgProperty::AddGroups(ctlComboBoxFix *combo)
+{
+    if (connection->BackendMinimumVersion(8, 1))
+    {
+        FillCombobox(wxT("SELECT rolname FROM pg_roles WHERE NOT rolcanlogin ORDER BY 1"), combo);
+    }
+    else
+    {
+        FillCombobox(wxT("SELECT groname FROM pg_group ORDER BY 1"), combo);
+    }
+}
+
+
 void dlgProperty::PrepareTablespace(ctlComboBoxFix *cb, const OID current)
 {
     wxASSERT(cb != 0);

pgadmin/dlg/dlgFunction.cpp

@@ -177 +177 @@
     if (!isBackendMinVer84)
         txtArgDefVal->Disable();
 
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     lstArguments->AddColumn(_("Type"), 60);

pgadmin/dlg/dlgTable.cpp

@@ -205 +205 @@
 {
     if (!table)
         cbOwner->Append(wxT(""));
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
     PrepareTablespace(cbTablespace);
     PopulateDatatypeCache();

pgadmin/dlg/dlgPackage.cpp

@@ -65 +65 @@
 
     cbOwner->Disable();
 
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     if (package)

pgadmin/dlg/dlgTablespace.cpp

@@ -77 +77 @@
 {
     if (!tablespace)
         cbOwner->Append(wxEmptyString);
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     pgSet *set;

pgadmin/dlg/dlgDatabase.cpp

@@ -107 +107 @@
     if (!database)
         cbOwner->Append(wxT(""));
 
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     if (connection->BackendMinimumVersion(8,5))

pgadmin/dlg/dlgSequence.cpp

@@ -66 +66 @@
 {
     if (!sequence)
         cbOwner->Append(wxEmptyString);
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     if (sequence)

pgadmin/dlg/dlgView.cpp

@@ -56 +56 @@
 
 int dlgView::Go(bool modal)
 {
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
 
     if (view)

pgadmin/dlg/dlgSchema.cpp

@@ -47 +47 @@
     if (!schema)
         cbOwner->Append(wxT(""));
 
-    AddGroups();
+    AddGroups(cbOwner);
     AddUsers(cbOwner);
     if (schema)
     {