Merge pull request #1 from bdukes/ddr

Template Arguments for Razor Action Menu Template
dnnsoftware · Mar 17, 2014 · 570ad45 · 570ad45
2 parents 5d8aee8 + 3b78d40
commit 570ad45
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/DNN Platform/Modules/DDRMenu/Actions.cs b/DNN Platform/Modules/DDRMenu/Actions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Web.UI;
@@ -64,6 +64,7 @@ protected override void OnPreRender(EventArgs e)
 
 				try
 				{
+					navProvider.TemplateArguments = TemplateArguments;
 					BindMenu(Navigation.GetActionNodes(ActionRoot, this, -1));
 				}
 				catch (Exception exc)

diff --git a/DNN Platform/Modules/DDRMenu/DDRMenuNavigationProvider.cs b/DNN Platform/Modules/DDRMenu/DDRMenuNavigationProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Web.UI;
@@ -102,6 +102,8 @@ public class DDRMenuNavigationProvider : NavigationProvider
 
 		public string MenuStyle { get; set; }
 
+		public List<TemplateArgument> TemplateArguments { get; set; }
+
 		public override void Initialize()
 		{
 			menuControl = new DDRMenuControl {ID = ControlID, EnableViewState = false};
@@ -183,7 +185,8 @@ public void Bind(DNNNodeCollection objNodes, bool localise)
 										IncludeNodes = GetCustomAttribute("IncludeNodes"),
 			                           	ExcludeNodes = GetCustomAttribute("ExcludeNodes"),
 			                           	NodeManipulator = GetCustomAttribute("NodeManipulator"),
-			                           	ClientOptions = clientOptions
+			                           	ClientOptions = clientOptions,
+			                           	TemplateArguments = TemplateArguments,
 			                           };
 		}
 

diff --git a/DNN Platform/Modules/DDRMenu/TemplateEngine/RazorTemplateProcessor.cs b/DNN Platform/Modules/DDRMenu/TemplateEngine/RazorTemplateProcessor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Dynamic;
 using System.IO;
@@ -38,7 +38,8 @@ public void Render(object source, HtmlTextWriter htmlWriter, TemplateDefinition
                 model.ManifestPath = resolver.Resolve("/", PathResolver.RelativeTo.Manifest);
                 model.PortalPath = resolver.Resolve("/", PathResolver.RelativeTo.Portal);
                 model.SkinPath = resolver.Resolve("/", PathResolver.RelativeTo.Skin);
-
+                var modelDictionary = model as IDictionary<string, object>;
+                liveDefinition.TemplateArguments.ForEach(a => modelDictionary.Add(a.Name, a.Value));
 
                 var razorEngine = new RazorEngine(liveDefinition.TemplateVirtualPath, null, null);
                 var writer = new StringWriter();

diff --git a/DNN_Platform.sln b/DNN_Platform.sln
@@ -294,6 +294,12 @@ Global
 		{1A0646A3-CB4A-4E8E-A497-2C677DE320FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A0646A3-CB4A-4E8E-A497-2C677DE320FF}.Release|x86.ActiveCfg = Release|x86
 		{1A0646A3-CB4A-4E8E-A497-2C677DE320FF}.Release|x86.Build.0 = Release|x86
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345}.Release|x86.ActiveCfg = Release|Any CPU
 		{839E7C68-1867-4B99-8507-FB50CE45EB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{839E7C68-1867-4B99-8507-FB50CE45EB10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{839E7C68-1867-4B99-8507-FB50CE45EB10}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -523,6 +529,7 @@ Global
 		{CA056730-5759-41F8-A6C1-420F9C0C63E7} = {1DFA65CE-5978-49F9-83BA-CFBD0C7A1814}
 		{5DEAB0D5-0F54-44C9-A167-F48264A04B3D} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}
 		{1A0646A3-CB4A-4E8E-A497-2C677DE320FF} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}
+		{A86EBC44-2BC8-4C4A-997B-2708E4AAC345} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}
 		{839E7C68-1867-4B99-8507-FB50CE45EB10} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}
 		{CD8732D8-B4DD-435D-BF21-A90C2964ABA4} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}
 		{E242FA80-7523-4AE5-A804-809175D0E702} = {FDDC95FE-3341-4AED-A93E-7A5DF85A55C2}