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.

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

Created INavigationManager to replace Globals.NavigateURL #3160

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
535b0b5
Added INavigationManager and updated Globals to reference new INaviga…
SkyeHoefling Oct 16, 2019
acf48d0
Updated CreateModule to use new INavigationManager
SkyeHoefling Oct 16, 2019
be20b2c
Deprecated NavigateURL for v11.0
SkyeHoefling Oct 16, 2019
786680c
Updated viewsource to use INavigationManager
SkyeHoefling Oct 16, 2019
920d2d3
Migrated Globals.NavigateUrl to use INavigationManager
SkyeHoefling Oct 16, 2019
06dfe45
Updated persona bar controllers to use NavigateUrl
SkyeHoefling Oct 16, 2019
84a62ca
Refactored NavigateURL to use new INavigationManager
SkyeHoefling Oct 16, 2019
6c5dacf
Refactored Globals.NavigateURL -> INavigationManager
SkyeHoefling Oct 16, 2019
369b0cf
Refactored more NavigationManager usages
SkyeHoefling Oct 16, 2019
cf60be8
Updated more references to Globals.NavigateURL to use INavigationManager
SkyeHoefling Oct 16, 2019
c4fb6d1
Cleaned up mistakes that happened in config files in csproj files. Th…
SkyeHoefling Oct 17, 2019
a28c45e
removed generated nodes from csproj
SkyeHoefling Oct 17, 2019
f16b926
Fixed spacing in web.config
SkyeHoefling Oct 17, 2019
1df11ed
Updated old Globals.NavigateURL methods to use registered INavigation…
SkyeHoefling Oct 17, 2019
b541e14
Updated INavigationManager reference to be static readonly instead of…
SkyeHoefling Oct 17, 2019
171667a
Aliased Constants to 'Dnn.PersonaBar.Libary.Constants' to handle ambi…
SkyeHoefling Oct 17, 2019
fe4ba9b
Added DependencyInjection to website project and updated RazorHost an…
SkyeHoefling Oct 17, 2019
c8d41d1
Updated DotNetNuke.Website Globals.NavigateURL references to use the …
SkyeHoefling Oct 17, 2019
0c3a4ad
Added missing using statement
SkyeHoefling Oct 17, 2019
20969ba
Fixing typo
SkyeHoefling Oct 17, 2019
af0dc25
Removing whitespace
SkyeHoefling Oct 17, 2019
adfc7ba
Fix typo
SkyeHoefling Oct 17, 2019
990d5ba
Use GetRequiredService for INavigationManager
SkyeHoefling Oct 17, 2019
87e5a69
Added new DotNetNuke.Abstractions project for storing different commo…
SkyeHoefling Oct 17, 2019
35b14ae
Updated all (non website project) classes to use INavigationManager f…
SkyeHoefling Oct 18, 2019
ec10808
Updated Website Project to use the INavigationManager from the new Do…
SkyeHoefling Oct 18, 2019
cadd83b
Removed unnecessary attributes from NavigationManager
SkyeHoefling Oct 18, 2019
7d22dae
Updated redirection controller tests to mock out the DependencyProvid…
SkyeHoefling Oct 18, 2019
ea2b32a
Fixed failing unit tests with mocking out INavigationManager
SkyeHoefling Oct 18, 2019
df2ba4d
Removed private fields for DependencyProvider
SkyeHoefling Oct 18, 2019
e808def
Added singleton clear statements to prevent the INavigationManager fr…
SkyeHoefling Oct 18, 2019
4d82510
Reset singleton state for PortalController to reduce side-effects fro…
SkyeHoefling Oct 18, 2019
855edc3
Moved state cleanup code to teardown routine
SkyeHoefling Oct 18, 2019
716f974
Fixed failing unit tests in tests.web project. Added mocks for INavig…
SkyeHoefling Oct 18, 2019
57c4c75
Added new DotNetNuke.Abstractions.nuspec to create NuGets during build
SkyeHoefling Oct 18, 2019
1b93ce4
Added missing nuspec files to the solution file
SkyeHoefling Oct 18, 2019
68ab5fd
Updated copyright on all nuget files
SkyeHoefling Oct 18, 2019
6bdaff1
Added .NET Foundation file headers to new Abstraction files
SkyeHoefling Oct 18, 2019
94d277f
Resolved duplicate addition of DotNetNuke.Abstractions to sln file
SkyeHoefling Oct 19, 2019
85b5553
Added SetTestableInstance and Clear methods to make it easier to test…
SkyeHoefling Oct 20, 2019
4c0262a
Added happy path test for Navigation Manager
SkyeHoefling Oct 20, 2019
326c80e
Added NavigationManager tests
SkyeHoefling Oct 20, 2019
5791d46
Updated all INavigationManager references in .ascx.cs files to use pr…
SkyeHoefling Oct 20, 2019
c3923c0
Merge branch 'release/9.4.x' into globals_navigation_manager
SkyeHoefling Oct 20, 2019
1420e3e
Removed extra's added by visual studio to .csproj files
SkyeHoefling Oct 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
Prev Previous commit
Next Next commit
Migrated Globals.NavigateUrl to use INavigationManager
  • Loading branch information
SkyeHoefling committed Oct 20, 2019
commit 920d2d30290c31b5aa75a9bdc40c2ea37b269d81
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@

using System.Web.Mvc;
using System.Web.Routing;
using Microsoft.Extensions.DependencyInjection;
using DotNetNuke.Common;
using DotNetNuke.Common.Interfaces;
using DotNetNuke.Web.Mvc.Framework.Controllers;
using DotNetNuke.Web.Mvc.Helpers;

namespace DotNetNuke.Web.Mvc.Framework.ActionResults
{
internal class DnnRedirecttoRouteResult : RedirectToRouteResult
{
protected INavigationManager NavigationManager { get; }
public DnnRedirecttoRouteResult(string actionName, string controllerName, string routeName, RouteValueDictionary routeValues, bool permanent)
: base(routeName, routeValues, permanent)
{
NavigationManager = Globals.DependencyProvider.GetService<INavigationManager>();
ActionName = actionName;
ControllerName = controllerName;
}
Expand Down Expand Up @@ -62,7 +66,7 @@ public override void ExecuteResult(ControllerContext context)
else
{
//TODO - match other actions
url = Globals.NavigateURL();
url = NavigationManager.NavigateURL();
}

if (Permanent)
Expand Down
3 changes: 0 additions & 3 deletions DNN Platform/Library/Common/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2896,9 +2896,6 @@ public static string UserProfileURL(int userId)
return strURL;
}




/// <summary>
/// Gets the URL to the current page.
/// </summary>
Expand Down
30 changes: 19 additions & 11 deletions DNN Platform/Library/Common/Internal/GlobalsImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,23 @@
using System;
using System.Text;
using System.Web;
using DotNetNuke.Common.Interfaces;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Tabs;
using DotNetNuke.UI.UserControls;
using Microsoft.Extensions.DependencyInjection;

namespace DotNetNuke.Common.Internal
{
public class GlobalsImpl : IGlobals
{
protected INavigationManager NavigationManager { get; }
public GlobalsImpl()
{
NavigationManager = Globals.DependencyProvider.GetService<INavigationManager>();
}

public string ApplicationPath
{
get { return Globals.ApplicationPath; }
Expand Down Expand Up @@ -180,57 +188,57 @@ public string LoginURL(string returnURL, bool @override)

public string NavigateURL()
{
return Globals.NavigateURL();
return NavigationManager.NavigateURL();
}

public string NavigateURL(int tabID)
{
return Globals.NavigateURL(tabID);
return NavigationManager.NavigateURL(tabID);
}

public string NavigateURL(int tabID, bool isSuperTab)
{
return Globals.NavigateURL(tabID, isSuperTab);
return NavigationManager.NavigateURL(tabID, isSuperTab);
}

public string NavigateURL(string controlKey)
{
return Globals.NavigateURL(controlKey);
return NavigationManager.NavigateURL(controlKey);
}

public string NavigateURL(string controlKey, params string[] additionalParameters)
{
return Globals.NavigateURL(controlKey, additionalParameters);
return NavigationManager.NavigateURL(controlKey, additionalParameters);
}

public string NavigateURL(int tabID, string controlKey)
{
return Globals.NavigateURL(tabID, controlKey);
return NavigationManager.NavigateURL(tabID, controlKey);
}

public string NavigateURL(int tabID, string controlKey, params string[] additionalParameters)
{
return Globals.NavigateURL(tabID, controlKey, additionalParameters);
return NavigationManager.NavigateURL(tabID, controlKey, additionalParameters);
}

public string NavigateURL(int tabID, PortalSettings settings, string controlKey, params string[] additionalParameters)
{
return Globals.NavigateURL(tabID, settings, controlKey, additionalParameters);
return NavigationManager.NavigateURL(tabID, settings, controlKey, additionalParameters);
}

public string NavigateURL(int tabID, bool isSuperTab, PortalSettings settings, string controlKey, params string[] additionalParameters)
{
return Globals.NavigateURL(tabID, isSuperTab, settings, controlKey, additionalParameters);
return NavigationManager.NavigateURL(tabID, isSuperTab, settings, controlKey, additionalParameters);
}

public string NavigateURL(int tabID, bool isSuperTab, PortalSettings settings, string controlKey, string language, params string[] additionalParameters)
{
return Globals.NavigateURL(tabID, isSuperTab, settings, controlKey, language, additionalParameters);
return NavigationManager.NavigateURL(tabID, isSuperTab, settings, controlKey, language, additionalParameters);
}

public string NavigateURL(int tabID, bool isSuperTab, PortalSettings settings, string controlKey, string language, string pageName, params string[] additionalParameters)
{
return Globals.NavigateURL(tabID, isSuperTab, settings, controlKey, language, pageName, additionalParameters);
return NavigationManager.NavigateURL(tabID, isSuperTab, settings, controlKey, language, pageName, additionalParameters);
}

public string FriendlyUrl(TabInfo tab, string path)
Expand Down
3 changes: 2 additions & 1 deletion DNN Platform/Library/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@
[assembly: InternalsVisibleTo("DotNetNuke.Tests.Web.Mvc")]
[assembly: InternalsVisibleTo("DotNetNuke.Tests.Urls")]
[assembly: InternalsVisibleTo("DotNetNuke.Tests.Professional")]
[assembly: InternalsVisibleTo("DotNetNuke.SiteExportImport")]
[assembly: InternalsVisibleTo("DotNetNuke.SiteExportImport")]
[assembly: InternalsVisibleTo("DotNetNuke.Web.DDRMenu")] // Once Globals is refeactored to Dependency Injection we should be able to remove this
6 changes: 4 additions & 2 deletions DNN Platform/Modules/DDRMenu/DNNAbstract.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Web;
using Microsoft.Extensions.DependencyInjection;
using DotNetNuke.Framework;
using DotNetNuke.UI;
using DotNetNuke.UI.WebControls;
Expand All @@ -15,6 +16,7 @@

namespace DotNetNuke.Web.DDRMenu
{
using DotNetNuke.Common.Interfaces;
using DotNetNuke.Framework.JavaScriptLibraries;

internal static class DNNAbstract
Expand All @@ -25,7 +27,7 @@ public static string GetLoginUrl()

if (request.IsAuthenticated)
{
return Globals.NavigateURL(PortalSettings.Current.ActiveTab.TabID, "Logoff");
return Globals.DependencyProvider.GetService<INavigationManager>().NavigateURL(PortalSettings.Current.ActiveTab.TabID, "Logoff");
}

var returnUrl = HttpContext.Current.Request.RawUrl;
Expand All @@ -46,7 +48,7 @@ public static string GetUserUrl()
{
if (portalSettings.UserRegistration != (int)Globals.PortalRegistrationType.NoRegistration)
{
return Globals.RegisterURL(HttpUtility.UrlEncode(Globals.NavigateURL()), Null.NullString);
return Globals.RegisterURL(HttpUtility.UrlEncode(Globals.DependencyProvider.GetService<INavigationManager>().NavigateURL()), Null.NullString);
}
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<SccProvider>
</SccProvider>
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -82,6 +83,12 @@
<HintPath>_dependencies\Ealo\05.05.00\effority.ealo.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
Expand Down Expand Up @@ -188,6 +195,7 @@
<SubType>Designer</SubType>
</None>
<Content Include="Module.build" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="BuildScripts\" />
Expand Down
5 changes: 5 additions & 0 deletions DNN Platform/Modules/DDRMenu/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -81,6 +82,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -336,7 +343,9 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="web.config" />
<Content Include="web.config">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
10 changes: 9 additions & 1 deletion DNN Platform/Modules/DigitalAssets/FolderMappings.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@

using System;
using System.Collections.Generic;
using Microsoft.Extensions.DependencyInjection;

using DotNetNuke.Application;
using DotNetNuke.Common.Interfaces;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Framework.JavaScriptLibraries;
Expand All @@ -38,6 +40,12 @@ namespace DotNetNuke.Modules.DigitalAssets
{
public partial class FolderMappings : PortalModuleBase
{
protected INavigationManager NavigationManager { get; }
public FolderMappings()
{
NavigationManager = DependencyProvider.GetService<INavigationManager>();
}

#region Private Variables

private readonly IFolderMappingController _folderMappingController = FolderMappingController.Instance;
Expand Down Expand Up @@ -102,7 +110,7 @@ protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
JavaScript.RegisterClientReference(Page, ClientAPI.ClientNamespaceReferences.dnn);
CancelButton.NavigateUrl = Globals.NavigateURL();
CancelButton.NavigateUrl = NavigationManager.NavigateURL();
NewMappingButton.Click += OnNewMappingClick;

if (!IsPostBack)
Expand Down
6 changes: 5 additions & 1 deletion DNN Platform/Modules/DigitalAssets/View.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
using System.Text;
using System.Text.RegularExpressions;
using System.Web;
using Microsoft.Extensions.DependencyInjection;

using DotNetNuke.Common;
using DotNetNuke.Common.Interfaces;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Icons;
using DotNetNuke.Entities.Modules;
Expand Down Expand Up @@ -64,9 +66,11 @@ public partial class View : PortalModuleBase, IActionable
private readonly ExtensionPointManager epm = new ExtensionPointManager();
private NameValueCollection damState;

protected INavigationManager NavigationManager { get; }
public View()
{
controller = new Factory().DigitalAssetsController;
NavigationManager = DependencyProvider.GetService<INavigationManager>();
}

private IExtensionPointFilter Filter
Expand Down Expand Up @@ -139,7 +143,7 @@ protected string NavigateUrl
{
get
{
var url = Globals.NavigateURL(TabId, "ControlKey", "mid=" + ModuleId, "ReturnUrl=" + Server.UrlEncode(Globals.NavigateURL()));
var url = NavigationManager.NavigateURL(TabId, "ControlKey", "mid=" + ModuleId, "ReturnUrl=" + Server.UrlEncode(NavigationManager.NavigateURL()));

//append popUp parameter
var delimiter = url.Contains("?") ? "&" : "?";
Expand Down
2 changes: 2 additions & 0 deletions DNN Platform/Modules/DigitalAssets/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" allowedVersions="[5.2.3]" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" allowedVersions="[5.2.3]" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" allowedVersions="[5.2.3]" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" allowedVersions="[10.0.3]" />
</packages>
8 changes: 8 additions & 0 deletions DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -90,6 +91,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -183,6 +190,7 @@
<Content Include="Settings.ascx" />
<None Include="dnn_HTML.dnn" />
<Content Include="Module.build" />
<None Include="packages.config" />
<None Include="Providers\DataProviders\SqlDataProvider\03.00.00.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\03.01.00.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\04.05.00.SqlDataProvider" />
Expand Down
11 changes: 9 additions & 2 deletions DNN Platform/Modules/HTML/EditHtml.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Microsoft.Extensions.DependencyInjection;
using DotNetNuke.Common;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Users;
Expand All @@ -38,6 +39,7 @@
using DotNetNuke.Common.Utilities;
using Telerik.Web.UI;
using DotNetNuke.Modules.Html.Components;
using DotNetNuke.Common.Interfaces;

#endregion

Expand All @@ -51,6 +53,11 @@ namespace DotNetNuke.Modules.Html
/// </remarks>
public partial class EditHtml : HtmlModuleBase
{
protected INavigationManager NavigationManager { get; }
public EditHtml()
{
NavigationManager = DependencyProvider.GetService<INavigationManager>();
}

#region Private Members

Expand Down Expand Up @@ -435,7 +442,7 @@ protected override void OnInit(EventArgs e)
{
base.OnInit(e);

hlCancel.NavigateUrl = Globals.NavigateURL();
hlCancel.NavigateUrl = NavigationManager.NavigateURL();

cmdEdit.Click += OnEditClick;
cmdPreview.Click += OnPreviewClick;
Expand Down Expand Up @@ -583,7 +590,7 @@ protected void OnSaveClick(object sender, EventArgs e)
// redirect back to portal
if (redirect)
{
Response.Redirect(Globals.NavigateURL(), true);
Response.Redirect(NavigationManager.NavigateURL(), true);
}
}
protected void OnEditClick(object sender, EventArgs e)
Expand Down
Loading