Merge pull request #48 from juvander/Fix_for_issue_#47

Fix for issue #47
DNNCommunity · Oct 6, 2020 · bbe9ae2 · bbe9ae2
2 parents 1d1aeb7 + 66cd7b7
commit bbe9ae2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 34 deletions.
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -8,6 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("04.01.00.00")]
+[assembly: System.Reflection.AssemblyVersion("04.01.01.00")]
 
 
diff --git a/DotNetNuke_DotNetNuke.Repository.dnn b/DotNetNuke_DotNetNuke.Repository.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-	  <package name="DotNetNuke.Repository" type="Module" version="04.01.00">
+	  <package name="DotNetNuke.Repository" type="Module" version="04.01.01">
   <friendlyName>Repository</friendlyName>
   <description>A file/object repository module that includes skinning and community features like comments and user ratings.</description>
       <iconFile>icon_repository_32px.gif</iconFile>      
@@ -321,7 +321,7 @@
   </components>
 </package>
 
-<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.00">
+<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.01">
   <friendlyName>Repository Dashboard</friendlyName>
   <description></description>
   <owner>

diff --git a/ReleaseNotes.html b/ReleaseNotes.html
@@ -1,4 +1,7 @@
-<h2>Repository 4.0.0</h2>
+<h2>Repository 4.1.1</h2>
+<p>Fix for issue ¤47</p>
+<hr />
+<h2>Repository 4.0.0</h2>
 <p>This is a total rewrite in c# and brings the module Dnn 9.2 compatible. This is a pre-release version and should not be used in a production environment.</p>
 <hr />
 <h2>Repository 3.5.6</h2>

diff --git a/Repository.ascx.cs b/Repository.ascx.cs
@@ -231,9 +231,9 @@ private void Page_Load(System.Object sender, System.EventArgs e)
 
 			oRepositoryBusinessController.LocalResourceFile = m_LocalResourceFile;
 			oRepositoryBusinessController.SetRepositoryFolders(ModuleId);
-
-			if (Request.Cookies[string.Format("_DRMCategory{0}", ModuleId)] != null) {
-				oRepositoryBusinessController.g_CategoryId = int.Parse(Request.Cookies[string.Format("_DRMCategory{0}", ModuleId)].Value);
+           
+            if (ViewState[string.Format("_DRMCategory{0}", ModuleId)] != null) {
+                oRepositoryBusinessController.g_CategoryId = int.Parse(Convert.ToString(ViewState[string.Format("_DRMCategory{0}", ModuleId)]));
 			} else {
 				bool allDefault = false;
 				if (Settings["AllowAllFiles"] != null) {
@@ -372,9 +372,9 @@ private void Page_Load(System.Object sender, System.EventArgs e)
 
 			}
 
-			CreateCookie();
+            ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
 
-			CheckItemRoles();
+            CheckItemRoles();
 
 			LoadRepositoryTemplates();
 
@@ -1678,8 +1678,8 @@ private void ddlCategories_SelectedIndexChanged(object sender, System.EventArgs
 			lstObjects.CurrentPageIndex = 0;
 			ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
 			ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
-			CreateCookie();
-			BindObjectList();
+            ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
+            BindObjectList();
 		}
 
 		public void TreeNodeClick(object source, DotNetNuke.UI.WebControls.DNNTreeNodeClickEventArgs e)
@@ -1693,8 +1693,8 @@ public void TreeNodeClick(object source, DotNetNuke.UI.WebControls.DNNTreeNodeCl
 			lstObjects.CurrentPageIndex = 0;
 			ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
 			ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
-			CreateCookie();
-			BindObjectList();
+            ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
+            BindObjectList();
 		}
 
 		private void ddlCategories2_SelectedIndexChanged(object sender, System.EventArgs e)
@@ -1740,8 +1740,8 @@ private void ddlAttribute_SelectedIndexChanged(object sender, System.EventArgs e
 			lstObjects.CurrentPageIndex = 0;
 			ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
 			ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
-			CreateCookie();
-			BindObjectList();
+            ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
+            BindObjectList();
 		}
 
 		#endregion
@@ -1939,22 +1939,6 @@ private void CheckItemRoles()
 
 		}
 
-
-		private void CreateCookie()
-		{
-			HttpCookie objCategory = null;
-
-			if (Request.Cookies["_DRMCategory" + ModuleId] == null) {
-				objCategory = new HttpCookie("_DRMCategory" + ModuleId);
-				Response.AppendCookie(objCategory);
-			}
-
-			objCategory = Request.Cookies["_DRMCategory" + ModuleId];
-			objCategory.Value = oRepositoryBusinessController.g_CategoryId.ToString();
-			Response.SetCookie(objCategory);
-
-		}
-
 		private bool CheckUserRoles(string roles)
 		{
 			if (string.IsNullOrEmpty(roles)) {
@@ -2935,9 +2919,8 @@ public void OnModuleCommunication(object s, DotNetNuke.Entities.Modules.Communic
 						mFilter = e.Value.ToString();
 						break;
 				}
-				CreateCookie();
-
-				ViewState["mFilter"] = mFilter;
+                ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
+                ViewState["mFilter"] = mFilter;
 				ViewState["mSortOrder"] = mSortOrder;
 				ViewState["mPage"] = "0";
 				ViewState["mItemID"] = mItemID;