From eb2c17156362a9136430c78e7e3fb7a260992d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20T=C3=A9tard?=
<62659880+stetard@users.noreply.github.com>
Date: Fri, 15 May 2026 13:39:55 +0200
Subject: [PATCH] #51 Fixed an issue related to adding a new dashboard module
to a page (without parameters).
---
.../RepositoryDashboard.ascx.resx | 179 +++++++++++++-----
RepositoryDashboard.ascx | 3 +-
RepositoryDashboard.ascx.cs | 36 ++--
3 files changed, 154 insertions(+), 64 deletions(-)
diff --git a/App_LocalResources/RepositoryDashboard.ascx.resx b/App_LocalResources/RepositoryDashboard.ascx.resx
index e0ec0fc..beb734e 100644
--- a/App_LocalResources/RepositoryDashboard.ascx.resx
+++ b/App_LocalResources/RepositoryDashboard.ascx.resx
@@ -1,51 +1,132 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 1.0.0.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Repository Settings
-
-
- Click to view
-
-
- All Items
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Repository Settings
+
+
+ Click to view
+
+
+ All Items
+
+
+ <b><font color=red>ADMIN:</font></b> Select Repository Dashboard Settings from the Module Settings drop down menu to select the Repository instance.<br>
+
\ No newline at end of file
diff --git a/RepositoryDashboard.ascx b/RepositoryDashboard.ascx
index 61e6045..bca52d5 100644
--- a/RepositoryDashboard.ascx
+++ b/RepositoryDashboard.ascx
@@ -1,5 +1,6 @@
-<%@ Control language="vb" Inherits="DotNetNuke.Modules.Repository.RepositoryDashboard" CodeBehind="RepositoryDashboard.ascx.vb" AutoEventWireup="False" Explicit="True" %>
+<%@ Control language="vb" Inherits="DotNetNuke.Modules.Repository.RepositoryDashboard" CodeBehind="RepositoryDashboard.ascx.cs" AutoEventWireup="false" Explicit="true" %>
+
diff --git a/RepositoryDashboard.ascx.cs b/RepositoryDashboard.ascx.cs
index a1513f9..b758545 100644
--- a/RepositoryDashboard.ascx.cs
+++ b/RepositoryDashboard.ascx.cs
@@ -64,6 +64,7 @@ protected System.Web.UI.WebControls.DataList datList {
}
}
}
+ protected System.Web.UI.WebControls.Label lblAdminMessage;
protected System.Web.UI.WebControls.Table DashTable;
protected System.Web.UI.WebControls.PlaceHolder PlaceHolder;
@@ -174,20 +175,27 @@ private void Page_Load(System.Object sender, System.EventArgs e)
m_RowCount = 10;
}
- CheckItemRoles();
- oRepositoryBusinessController.SetRepositoryFolders(m_RepositoryId);
+ if (m_RepositoryId != -1)
+ {
+ CheckItemRoles();
+ oRepositoryBusinessController.SetRepositoryFolders(m_RepositoryId);
- LoadDashboardTemplate();
- m_hasTree = false;
- BindData();
+ LoadDashboardTemplate();
+ m_hasTree = false;
+ BindData();
+ }
+ else if (this.UserInfo.IsInRole(PortalSettings.AdministratorRoleName))
+ {
+ lblAdminMessage.Text = Localization.GetString("InitialMessage", LocalResourceFile);
+ }
- }
+ }
- private void datList_ItemDataBound(object sender, System.Web.UI.WebControls.DataListItemEventArgs e)
+ private void datList_ItemDataBound(object sender, System.Web.UI.WebControls.DataListItemEventArgs e)
{
RepositoryCategoryInfo objCategory = null;
RepositoryInfo objItem = null;
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
int iPtr = 0;
if (m_RepositoryId == -1) {
@@ -263,7 +271,7 @@ private void lstObjects_ItemDataBound(object sender, System.Web.UI.WebControls.D
{
RepositoryCategoryController categories = new RepositoryCategoryController();
RepositoryCategoryInfo objCategory = null;
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
RepositoryInfo objItem = null;
int iPtr = 0;
@@ -553,7 +561,7 @@ private void lstObjects_ItemCommand(object source, System.Web.UI.WebControls.Dat
private void CheckForAllItems(ArrayList categories)
{
RepositoryController repository = new RepositoryController();
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
bool addAllItems = false;
if (m_RepositoryId != -1) {
@@ -618,7 +626,7 @@ private bool CheckAnyUserRoles(string roles)
private ArrayList RecalcCategoryCount(ArrayList categories)
{
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
RepositoryController repository = new RepositoryController();
RepositoryObjectCategoriesController rc = new RepositoryObjectCategoriesController();
@@ -664,7 +672,7 @@ private ArrayList RecalcCategoryCount(ArrayList categories)
private void BindData()
{
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
RepositoryController repository = new RepositoryController();
RepositoryCategoryController cc = new RepositoryCategoryController();
ArrayList categories = cc.GetRepositoryCategories(m_RepositoryId, -1);
@@ -777,7 +785,7 @@ private void LoadBindableList(bool bIsPersonal, ArrayList repositoryItems, Array
private void LoadDashboardTemplate()
{
string strStyle = null;
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
switch (m_DashboardStyle) {
case "categories":
@@ -839,7 +847,7 @@ private bool FindRepository()
private void CheckItemRoles()
{
- var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, TabId, false);
+ var moduleInfo = ModuleController.Instance.GetModule(m_RepositoryId, DotNetNuke.Common.Utilities.Null.NullInteger, false);
try {
// get module settings for associated Repository
Hashtable RepositorySettings = moduleInfo.ModuleSettings;