Skip to content
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

Jump to bottom

Make Default Module Action Menu Configurable #2804

Merged
merged 6 commits into from
May 21, 2019
Merged

Make Default Module Action Menu Configurable #2804

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8360881
Make module action menu configurable via new Portal Setting
mikesmeltzer May 13, 2019
8a15dbf
Merge remote-tracking branch 'upstream/development' into development
mikesmeltzer May 13, 2019
4cfd9cd
Add script to setup default action menu in database. Ignore changes t…
mikesmeltzer May 18, 2019
3d4c269
Update 09.04.00.SqlDataProvider
mikesmeltzer May 19, 2019
49075ff
Remove database script
mikesmeltzer May 20, 2019
3b46e23
Remove SolutionInfo.cs Ignore
mikesmeltzer May 20, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ _ReSharper*

# Others

SolutionInfo.cs
mikesmeltzer marked this conversation as resolved.
Show resolved Hide resolved
[Oo]bj
TestResults
*.Cache
Expand Down
2 changes: 2 additions & 0 deletions DNN Platform/Library/Entities/Portals/PortalSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 1 addition & 0 deletions DNN Platform/Library/Entities/Portals/PortalSettingsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Library/UI/Containers/Container.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
24 changes: 24 additions & 0 deletions Website/Providers/DataProviders/SqlDataProvider/09.04.00.SqlDataProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,30 @@ AS

GO

/* Issue #2762 - Make Default Module Action Menu Configurable */
/***************************************************************/

BEGIN

INSERT INTO {databaseOwner}[{objectQualifier}PortalSettings] (PortalID, SettingName, SettingValue, CreatedByUserID, CreatedOnDate, LastModifiedByUserID, LastModifiedOnDate)
mikesmeltzer marked this conversation as resolved.
Show resolved Hide resolved
SELECT
PortalID,
'DefaultModuleActionMenu' AS SettingName,
'~/admin/Menus/ModuleActions/ModuleActions.ascx',
-1,
GetDate(),
-1,
GetDate()
FROM {databaseOwner}[{objectQualifier}Portals] p
WHERE PortalID IS NOT NULL
AND NOT EXISTS( SELECT PortalID, SettingName FROM {databaseOwner}[{objectQualifier}PortalSettings] ps WHERE ps.PortalID = p.PortalID AND ps.SettingName = 'DefaultModuleActionMenu')

END

GO



/************************************************************/
/***** SqlDataProvider *****/
/************************************************************/