2007-05-03 Marek Habersack <mhabersack@novell.com>

	* TreeNode.cs: correct version of the fix in r76488. Nodes
	retrieved from a navigation data source which have empty URL will
	not be selectable.

svn path=/trunk/mcs/; revision=76604

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index b921963a8b4286ea42e62b4756fffbbe617ba80a..d1db302cf4838460fd1fec2ee0dc6111c4a9835b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-03  Marek Habersack  <mhabersack@novell.com>
 
+       * TreeNode.cs: correct version of the fix in r76488. Nodes
+       retrieved from a navigation data source which have empty URL will
+       not be selectable.
+
        * TreeView.cs: revert r76488, it wasn't entirely correct. I need
        to investigate the special cases it solved a bit more.
 

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
index 0e2aace312b06995bea2ad6c8cdddb88c49219ec..89cfd466772f1ed840f2e8a7700d20f38ef158e7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
@@ -706,7 +706,10 @@ namespace System.Web.UI.WebControls
                        INavigateUIData navigateUIData = hierarchyData as INavigateUIData;
                        if (navigateUIData != null) {
                                Text = navigateUIData.ToString ();
-                               NavigateUrl = navigateUIData.NavigateUrl;
+                               string url = navigateUIData.NavigateUrl;
+                               NavigateUrl = url;
+                               if (String.IsNullOrEmpty (url))
+                                       SelectAction = TreeNodeSelectAction.None;
                        }
                }