Merge pull request #6080 from dnnsoftware/develop

Updates `release/10.0.0` with the latest changes from `develop`
dnnsoftware · Jun 21, 2024 · 4823a71 · 4823a71
2 parents 9524d28 + 6bb29fc
commit 4823a71
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/DNN Platform/Website/admin/Menus/ModuleActions/ModuleActions.js b/DNN Platform/Website/admin/Menus/ModuleActions/ModuleActions.js
@@ -313,7 +313,7 @@
             if (!rootText || rootText.length == 0) {
                 return;                
             }
-            root.append("<li class=\"" + rootClass + "\"><div>" + rootText + "</div>");
+            root.append("<li class=\"" + rootClass + "\"><div>" + moduleId + ":" + rootText + "</div>");
         }
 
         function buildQuickSettings(root, rootText, rootClass, rootIcon) {

diff --git a/DNN Platform/Website/admin/Modules/App_LocalResources/ModuleSettings.ascx.resx b/DNN Platform/Website/admin/Modules/App_LocalResources/ModuleSettings.ascx.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="https://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <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>
@@ -370,4 +370,10 @@
   <data name="MonikerExists.Text" xml:space="preserve">
     <value>The new value of the moniker already exists; it must be unique in the portal.</value>
   </data>
+  <data name="plModuleId.Help" xml:space="preserve">
+    <value>Displays the id of the module.</value>
+  </data>
+  <data name="plModuleId.Text" xml:space="preserve">
+    <value>Module Id</value>
+  </data>
 </root>
diff --git a/DNN Platform/Website/admin/Modules/Modulesettings.ascx b/DNN Platform/Website/admin/Modules/Modulesettings.ascx
@@ -23,6 +23,10 @@
         <div class="msmsContent dnnClear">
             <h2 id="dnnPanel-ModuleGeneralDetails" class="dnnFormSectionHead"><a href="" class="dnnSectionExpanded"><%=LocalizeString("GeneralDetails")%></a></h2>
             <fieldset>
+                <div class="dnnFormItem">
+                    <dnn:label id="plModuleId" runat="server" controlname="ltModuleId" />
+                    <span><asp:Literal ID="ltModuleId" runat="server"></asp:Literal></span>
+                </div>
                 <div class="dnnFormItem" id="cultureRow" runat="server">
                     <dnn:label id="cultureLabel" runat="server" controlname="cultureLanguageLabel" />
                     <dnnweb:dnnlanguagelabel id="cultureLanguageLabel" runat="server" />

diff --git a/DNN Platform/Website/admin/Modules/Modulesettings.ascx.cs b/DNN Platform/Website/admin/Modules/Modulesettings.ascx.cs
@@ -592,6 +592,7 @@ private void BindData()
                     this.dgPermissions.InheritViewPermissionsFromTab = this.Module.InheritViewPermissions;
                 }
 
+                this.ltModuleId.Text = this.module.ModuleID.ToString();
                 this.txtFriendlyName.Text = this.Module.DesktopModule.FriendlyName;
                 this.txtTitle.Text = this.Module.ModuleTitle;
                 this.ctlIcon.Url = this.Module.IconFile;

diff --git a/DNN Platform/Website/admin/Modules/Modulesettings.ascx.designer.cs b/DNN Platform/Website/admin/Modules/Modulesettings.ascx.designer.cs