Skip to content

Commit bbe9ae2

Browse files
authored
Merge pull request #48 from juvander/Fix_for_issue_#47
Fix for issue #47
2 parents 1d1aeb7 + 66cd7b7 commit bbe9ae2

4 files changed

Lines changed: 20 additions & 34 deletions

File tree

AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyVersion("04.01.00.00")]
11+
[assembly: System.Reflection.AssemblyVersion("04.01.01.00")]
1212

1313

DotNetNuke_DotNetNuke.Repository.dnn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DotNetNuke.Repository" type="Module" version="04.01.00">
3+
<package name="DotNetNuke.Repository" type="Module" version="04.01.01">
44
<friendlyName>Repository</friendlyName>
55
<description>A file/object repository module that includes skinning and community features like comments and user ratings.</description>
66
<iconFile>icon_repository_32px.gif</iconFile>
@@ -321,7 +321,7 @@
321321
</components>
322322
</package>
323323

324-
<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.00">
324+
<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.01">
325325
<friendlyName>Repository Dashboard</friendlyName>
326326
<description></description>
327327
<owner>

ReleaseNotes.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
<h2>Repository 4.0.0</h2>
1+
<h2>Repository 4.1.1</h2>
2+
<p>Fix for issue ¤47</p>
3+
<hr />
4+
<h2>Repository 4.0.0</h2>
25
<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>
36
<hr />
47
<h2>Repository 3.5.6</h2>

Repository.ascx.cs

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ private void Page_Load(System.Object sender, System.EventArgs e)
231231

232232
oRepositoryBusinessController.LocalResourceFile = m_LocalResourceFile;
233233
oRepositoryBusinessController.SetRepositoryFolders(ModuleId);
234-
235-
if (Request.Cookies[string.Format("_DRMCategory{0}", ModuleId)] != null) {
236-
oRepositoryBusinessController.g_CategoryId = int.Parse(Request.Cookies[string.Format("_DRMCategory{0}", ModuleId)].Value);
234+
235+
if (ViewState[string.Format("_DRMCategory{0}", ModuleId)] != null) {
236+
oRepositoryBusinessController.g_CategoryId = int.Parse(Convert.ToString(ViewState[string.Format("_DRMCategory{0}", ModuleId)]));
237237
} else {
238238
bool allDefault = false;
239239
if (Settings["AllowAllFiles"] != null) {
@@ -372,9 +372,9 @@ private void Page_Load(System.Object sender, System.EventArgs e)
372372

373373
}
374374

375-
CreateCookie();
375+
ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
376376

377-
CheckItemRoles();
377+
CheckItemRoles();
378378

379379
LoadRepositoryTemplates();
380380

@@ -1678,8 +1678,8 @@ private void ddlCategories_SelectedIndexChanged(object sender, System.EventArgs
16781678
lstObjects.CurrentPageIndex = 0;
16791679
ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
16801680
ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
1681-
CreateCookie();
1682-
BindObjectList();
1681+
ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
1682+
BindObjectList();
16831683
}
16841684

16851685
public void TreeNodeClick(object source, DotNetNuke.UI.WebControls.DNNTreeNodeClickEventArgs e)
@@ -1693,8 +1693,8 @@ public void TreeNodeClick(object source, DotNetNuke.UI.WebControls.DNNTreeNodeCl
16931693
lstObjects.CurrentPageIndex = 0;
16941694
ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
16951695
ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
1696-
CreateCookie();
1697-
BindObjectList();
1696+
ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
1697+
BindObjectList();
16981698
}
16991699

17001700
private void ddlCategories2_SelectedIndexChanged(object sender, System.EventArgs e)
@@ -1740,8 +1740,8 @@ private void ddlAttribute_SelectedIndexChanged(object sender, System.EventArgs e
17401740
lstObjects.CurrentPageIndex = 0;
17411741
ViewState["mPage"] = Convert.ToString(lstObjects.CurrentPageIndex);
17421742
ViewState["mAttributes"] = oRepositoryBusinessController.g_Attributes;
1743-
CreateCookie();
1744-
BindObjectList();
1743+
ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
1744+
BindObjectList();
17451745
}
17461746

17471747
#endregion
@@ -1939,22 +1939,6 @@ private void CheckItemRoles()
19391939

19401940
}
19411941

1942-
1943-
private void CreateCookie()
1944-
{
1945-
HttpCookie objCategory = null;
1946-
1947-
if (Request.Cookies["_DRMCategory" + ModuleId] == null) {
1948-
objCategory = new HttpCookie("_DRMCategory" + ModuleId);
1949-
Response.AppendCookie(objCategory);
1950-
}
1951-
1952-
objCategory = Request.Cookies["_DRMCategory" + ModuleId];
1953-
objCategory.Value = oRepositoryBusinessController.g_CategoryId.ToString();
1954-
Response.SetCookie(objCategory);
1955-
1956-
}
1957-
19581942
private bool CheckUserRoles(string roles)
19591943
{
19601944
if (string.IsNullOrEmpty(roles)) {
@@ -2935,9 +2919,8 @@ public void OnModuleCommunication(object s, DotNetNuke.Entities.Modules.Communic
29352919
mFilter = e.Value.ToString();
29362920
break;
29372921
}
2938-
CreateCookie();
2939-
2940-
ViewState["mFilter"] = mFilter;
2922+
ViewState[string.Format("_DRMCategory{0}", ModuleId)] = oRepositoryBusinessController.g_CategoryId;
2923+
ViewState["mFilter"] = mFilter;
29412924
ViewState["mSortOrder"] = mSortOrder;
29422925
ViewState["mPage"] = "0";
29432926
ViewState["mItemID"] = mItemID;

0 commit comments

Comments
 (0)