Merge pull request #27 from juvander/fix26

Fix for issue #26

Author: valadas

Form.ascx.cs

@@ -605,15 +605,15 @@ private void CreateInputForm()
 												PlaceHolder.Controls.Add(objDeleteButton);
 												break;
 											case "CATEGORIES":
-												RepositoryCategoryController categories = new RepositoryCategoryController();
+                                                RepositoryCategoryController categories = new RepositoryCategoryController();
 												RepositoryCategoryInfo category = null;
 												RepositoryObjectCategoriesController repositoryObjectCategories = new RepositoryObjectCategoriesController();
 												RepositoryObjectCategoriesInfo repositoryObjectCategory = null;
                                                 object obj = null;
 												// get control type for categories
 												string controlType = oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "Categories", "Select", "MULTIPLE");
 												if (controlType == "TREE") {
-													var objTree = new DnnTree();
+                                                    var objTree = new DnnTree();
 													objTree.ID = "__Categories";
 													objTree.SystemImagesPath = ResolveUrl("~/images/");
 													objTree.ImageList.Add(ResolveUrl("~/images/folder.gif"));
@@ -623,9 +623,9 @@ private void CreateInputForm()
 													objTree.EnableViewState = true;
                                                     objTree.CheckBoxes = true;
 													ArrayList ArrCategories = categories.GetRepositoryCategories(ModuleId, -1);
-													oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes[0], "", false);
-													PlaceHolder.Controls.Add(objTree);
-												} else {
+                                                    oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes, "", false);
+                                                    PlaceHolder.Controls.Add(objTree);
+                                                } else {
 													switch (Strings.UCase(controlType)) {
 														case "SINGLE":
 															var objSingle = new RadioButtonList();
@@ -688,7 +688,7 @@ private void CreateInputForm()
 													}
 
 												}
-												break;
+                                                break;
 											case "ATTRIBUTES":
 												RepositoryAttributesController attributes = new RepositoryAttributesController();
 												RepositoryAttributesInfo attribute = null;

Helpers.cs

@@ -708,7 +708,7 @@ public string ExtractFileName(string filename, bool ExtractGuid)
 
 		}
 
-		public void AddCategoryToTreeObject(int moduleid, int itemid, ArrayList arr, DotNetNuke.UI.WebControls.TreeNode obj, string prefix, bool showCount)
+		public void AddCategoryToTreeObject(int moduleid, int itemid, ArrayList arr, DotNetNuke.UI.WebControls.TreeNodeCollection obj, string prefix, bool showCount)
 		{
 			RepositoryObjectCategoriesController cc = new RepositoryObjectCategoriesController();
 			RepositoryObjectCategoriesInfo cv = null;
@@ -733,10 +733,10 @@ public void AddCategoryToTreeObject(int moduleid, int itemid, ArrayList arr, Dot
 					newNode.Selected = false;
 				}
 
-				obj.TreeNodes.Add(newNode);
+				obj.Add(newNode);
 				arr2 = cController.GetRepositoryCategories(moduleid, cat.ItemId);
 				if (arr2.Count > 0) {
-					AddCategoryToTreeObject(moduleid, itemid, arr2, newNode, "", showCount);
+					AddCategoryToTreeObject(moduleid, itemid, arr2, newNode.TreeNodes, "", showCount);
 				}
 			}
 		}

Repository.ascx.cs

@@ -2199,7 +2199,7 @@ private void ParseHeaderTemplate()
 														obj.CheckBoxes = false;
 														obj.NodeClick += TreeNodeClick;
 														bool bShowCount = bool.Parse(oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "CATEGORY", "ShowCount", "False"));
-														oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, -1, categories, obj.TreeNodes[0], "", bShowCount);
+														oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, -1, categories, obj.TreeNodes, "", bShowCount);
 														hPlaceHolder.Controls.Add(obj);
 														break;
 												}

RepositoryDashboard.ascx.cs

@@ -996,7 +996,7 @@ private void InjectDNNTreeToken(RepositoryCategoryController categories)
 			Arr = RecalcCategoryCount(Arr);
 
 			CheckForAllItems(Arr);
-			oRepositoryBusinessController.AddCategoryToTreeObject(m_RepositoryId, -1, Arr, obj.TreeNodes[0], "", bShowCount);
+			oRepositoryBusinessController.AddCategoryToTreeObject(m_RepositoryId, -1, Arr, obj.TreeNodes, "", bShowCount);
 			objPlaceHolder.Controls.Add(obj);
 			m_hasTree = true;
 		}