From 4d2e8790499034470dd1864464acac5269298079 Mon Sep 17 00:00:00 2001
From: ayende <ayende@73e77b4c-caa6-f847-a29a-24ab75ae54b6>
Date: Fri, 13 Jul 2007 16:12:14 +0000
Subject: [PATCH] MR-299 - Allowing ${OutputSubView("foo")}

git-svn-id: https://svn.castleproject.org/svn/castle/trunk@4052 73e77b4c-caa6-f847-a29a-24ab75ae54b6
---
 .../Castle.MonoRail.Views.Brail.Tests/BrailBugsTestCase.cs     |  8 ++++++++
 MonoRail/Castle.MonoRail.Views.Brail/BrailBase.cs              | 10 +++++-----
 MonoRail/TestSiteBrail/Controllers/BugsController.cs           |  5 +++++
 MonoRail/TestSiteBrail/TestSiteBrail.csproj                    |  3 ++-
 MonoRail/TestSiteBrail/Views/bugs/InlineSubView.brail          |  1 +
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 MonoRail/TestSiteBrail/Views/bugs/InlineSubView.brail

diff --git a/MonoRail/Castle.MonoRail.Views.Brail.Tests/BrailBugsTestCase.cs b/MonoRail/Castle.MonoRail.Views.Brail.Tests/BrailBugsTestCase.cs
index da90fd191..2db23951c 100644
--- a/MonoRail/Castle.MonoRail.Views.Brail.Tests/BrailBugsTestCase.cs
+++ b/MonoRail/Castle.MonoRail.Views.Brail.Tests/BrailBugsTestCase.cs
@@ -46,5 +46,13 @@ namespace Castle.MonoRail.Views.Brail.Tests
 			AssertSuccess();
 			AssertReplyContains("Success");
 		}
+
+        [Test]
+        public void MR_299_Inline_SubView()
+        {
+            DoGet("bugs/inlineSubView.rails");
+            AssertReplyContains("Success");
+	
+        }
 	}
 }
diff --git a/MonoRail/Castle.MonoRail.Views.Brail/BrailBase.cs b/MonoRail/Castle.MonoRail.Views.Brail/BrailBase.cs
index 634bdc2cf..5f22e0b22 100644
--- a/MonoRail/Castle.MonoRail.Views.Brail/BrailBase.cs
+++ b/MonoRail/Castle.MonoRail.Views.Brail/BrailBase.cs
@@ -129,20 +129,20 @@ namespace Castle.MonoRail.Views.Brail
 		/// actually relative to ViewDirRoot
 		/// </summary>
 		/// <param name="subviewName"></param>
-		public void OutputSubView(string subviewName)
+		public string OutputSubView(string subviewName)
 		{
-			OutputSubView(subviewName, new Hashtable());
+			return OutputSubView(subviewName, new Hashtable());
 		}
 
 		/// <summary>
 		/// Similiar to the OutputSubView(string) function, but with a bunch of parameters that are used
 		/// just for this subview. This parameters are /not/ inheritable.
 		/// </summary>
-		/// <param name="subviewName"></param>
-		/// <param name="parameters"></param>
-		public void OutputSubView(string subviewName, IDictionary parameters)
+		/// <returns>An empty string, just to make it possible to use inline ${OutputSubView("foo")}</returns>
+		public string OutputSubView(string subviewName, IDictionary parameters)
 		{
 			OutputSubView(subviewName, outputStream, parameters);
+		    return string.Empty;
 		}
 
 		/// <summary>
diff --git a/MonoRail/TestSiteBrail/Controllers/BugsController.cs b/MonoRail/TestSiteBrail/Controllers/BugsController.cs
index f2c3ae4bb..371fc8a9b 100644
--- a/MonoRail/TestSiteBrail/Controllers/BugsController.cs
+++ b/MonoRail/TestSiteBrail/Controllers/BugsController.cs
@@ -30,6 +30,11 @@ namespace Castle.MonoRail.Views.Brail.TestSite.Controllers
 		{
 			
 		}
+
+        public void InlineSubView()
+        {
+            
+        }
 	}
 }
 
diff --git a/MonoRail/TestSiteBrail/TestSiteBrail.csproj b/MonoRail/TestSiteBrail/TestSiteBrail.csproj
index ffe33d795..2a4afe718 100644
--- a/MonoRail/TestSiteBrail/TestSiteBrail.csproj
+++ b/MonoRail/TestSiteBrail/TestSiteBrail.csproj
@@ -208,6 +208,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Views\bugs\add.brail" />
+    <None Include="Views\bugs\InlineSubView.brail" />
     <None Include="Views\dsl\testXml.brail" />
     <None Include="Views\dsl\testSubViewWithComponents.brail" />
     <None Include="Views\home\NullPropagation.brail" />
@@ -240,4 +241,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MonoRail/TestSiteBrail/Views/bugs/InlineSubView.brail b/MonoRail/TestSiteBrail/Views/bugs/InlineSubView.brail
new file mode 100644
index 000000000..687a27b5b
--- /dev/null
+++ b/MonoRail/TestSiteBrail/Views/bugs/InlineSubView.brail
@@ -0,0 +1 @@
+${OutputSubView("add")}
-- 
2.11.4.GIT