Make Default Module Action Menu Configurable (#2804)

* Make module action menu configurable via new Portal Setting * Add script to setup default action menu in database. Ignore changes to Solution Info due to build scripts changing values locally. * Update 09.04.00.SqlDataProvider Add missing objectQualifier and databaseOwner. * Remove database script * Remove SolutionInfo.cs Ignore
dnnsoftware · May 21, 2019 · 1c37984 · 1c37984
1 parent 1ad0f42
commit 1c37984
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/DNN Platform/Library/Entities/Portals/PortalSettings.cs b/DNN Platform/Library/Entities/Portals/PortalSettings.cs
@@ -306,6 +306,8 @@ private void BuildPortalSettings(int tabId, PortalInfo portal)
         /// -----------------------------------------------------------------------------
         public int DefaultModuleId { get; internal set; }
 
+        public string DefaultModuleActionMenu { get; internal set; }
+
         public string DefaultPortalContainer { get; internal set; }
 
         public string DefaultPortalSkin { get; internal set; }

diff --git a/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs b/DNN Platform/Library/Entities/Portals/PortalSettingsController.cs
@@ -255,6 +255,7 @@ public virtual void LoadPortalSettings(PortalSettings portalSettings)
             portalSettings.DefaultAdminSkin = settings.GetValueOrDefault("DefaultAdminSkin", Host.Host.DefaultAdminSkin);
             portalSettings.DefaultIconLocation = settings.GetValueOrDefault("DefaultIconLocation", "icons/sigma");
             portalSettings.DefaultModuleId = settings.GetValueOrDefault("defaultmoduleid", Null.NullInteger);
+            portalSettings.DefaultModuleActionMenu = settings.GetValueOrDefault("DefaultModuleActionMenu", "~/admin/Menus/ModuleActions/ModuleActions.ascx");
             portalSettings.DefaultPortalContainer = settings.GetValueOrDefault("DefaultPortalContainer", Host.Host.DefaultPortalContainer);
             portalSettings.DefaultPortalSkin = settings.GetValueOrDefault("DefaultPortalSkin", Host.Host.DefaultPortalSkin);
             portalSettings.DefaultTabId = settings.GetValueOrDefault("defaulttabid", Null.NullInteger);

diff --git a/DNN Platform/Library/UI/Containers/Container.cs b/DNN Platform/Library/UI/Containers/Container.cs
@@ -342,7 +342,7 @@ private void ProcessModule()
                 if (InjectActionMenu && !ModuleHost.IsViewMode(ModuleConfiguration, PortalSettings) && Request.QueryString["dnnprintmode"] != "true")
                 {
                     JavaScript.RequestRegistration(CommonJs.DnnPlugins);
-                    ContentPane.Controls.Add(LoadControl("~/admin/Menus/ModuleActions/ModuleActions.ascx"));
+                    ContentPane.Controls.Add(LoadControl(PortalSettings.DefaultModuleActionMenu));
 
                     //register admin.css
                     ClientResourceManager.RegisterAdminStylesheet(Page, Globals.HostPath + "admin.css");