Skip to content

Fixed an issue related to adding a new dashboard module to a page #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valadas merged 1 commit into from
May 17, 2026
Merged

Fixed an issue related to adding a new dashboard module to a page #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 130 additions & 49 deletions App_LocalResources/RepositoryDashboard.ascx.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,132 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="ResMimeType">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="Version">
<value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ControlTitle_settings.Text">
<value>Repository Settings</value>
</data>
<data name="ClickToView.Text">
<value>Click to view</value>
</data>
<data name="AllowAllFiles.Text">
<value>All Items</value>
</data>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ControlTitle_settings.Text" xml:space="preserve">
<value>Repository Settings</value>
</data>
<data name="ClickToView.Text" xml:space="preserve">
<value>Click to view</value>
</data>
<data name="AllowAllFiles.Text" xml:space="preserve">
<value>All Items</value>
</data>
<data name="InitialMessage.Text" xml:space="preserve">
<value>&lt;b&gt;&lt;font color=red&gt;ADMIN:&lt;/font&gt;&lt;/b&gt; Select Repository Dashboard Settings from the Module Settings drop down menu to select the Repository instance.&lt;br&gt;</value>
</data>
</root>
3 changes: 2 additions & 1 deletion RepositoryDashboard.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %>
<div id="repository_dashboard_content" class="repository_dashboard_content">
<asp:Label ID="lblAdminMessage" runat="server" CssClass="normal" />
<asp:Table id="DashTable" Width="100%" Runat="server" CssClass="normal" CellSpacing="0" CellPadding="0"
BorderWidth="0">
<asp:TableRow Width="100%" VerticalAlign="Top">
Expand Down
36 changes: 22 additions & 14 deletions RepositoryDashboard.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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":
Expand Down Expand Up @@ -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;
Expand Down