SVN Commit by andreas: r4660 - in trunk/pgadmin3: . src/dlg

Author: andreas
Date: 2005-11-04 19:07:19 +0000 (Fri, 04 Nov 2005)
New Revision: 4660

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/dlg/dlgRole.cpp
Log:
Fix SET role (r:Florian Pflug), fix role help

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-11-04 18:48:55 UTC (rev 4659)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-11-04 19:07:19 UTC (rev 4660)
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-11-04 AP  1.4RC2 Fix SET role (r:Florian Pflug), fix role help
     <li>2005-11-04 DP  1.4RC2 Fix role inheritance option when creating roles, per Mike Allen
     <li>2005-11-03 DP  1.4RC2 Minor fix to the pgAgent command line parser, per Harald Armin Massa
     <li>2005-11-03 DP  1.4RC2 Honour type length/precision when creating composite types, per Ivan

Modified: trunk/pgadmin3/src/dlg/dlgRole.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-11-04 18:48:55 UTC (rev 4659)
+++ trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-11-04 19:07:19 UTC (rev 4660)
@@ -164,6 +164,9 @@
         }
         else
         {
+            varInfo.Add(wxT("role"));
+            cbVarname->Append(wxT("role"));
+
             pgSet *set;
             set=connection->ExecuteSet(wxT("SELECT name, vartype, min_val, max_val\n")
                     wxT("  FROM pg_settings WHERE context in ('user', 'superuser')"));
@@ -214,7 +217,8 @@
 {
     if (nbNotebook->GetSelection() == 2)
         return wxT("pg/runtime-config");
-    return dlgProperty::GetHelpPage();
+    else
+        return wxT("pg/sql-createrole");
 }