From 63d52a1e124e656d96579cf2264840f9abd38d83 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 2 May 2013 04:56:05 -1000
Subject: [PATCH] Fixes issues with transfering logic over to
 LegacyDialogHandler

---
 src/Umbraco.Web/Umbraco.Web.csproj                          | 6 ++++--
 .../umbraco/create/DLRScripting.ascx.cs                     | 3 ++-
 .../umbraco.presentation/umbraco/create/content.ascx.cs     | 5 ++---
 .../umbraco.presentation/umbraco/create/media.ascx.cs       | 4 ++--
 .../umbraco.presentation/umbraco/create/member.ascx.cs      | 4 ++--
 .../umbraco.presentation/umbraco/create/nodeType.ascx.cs    | 4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4ca48966bd..c9cd264443 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1985,9 +1985,11 @@
       <SubType>UserControl</SubType>
     </Content>
     <Content Include="umbraco.presentation\umbraco\create\media.ascx" />
-    <Content Include="umbraco.presentation\umbraco\create\member.ascx" />
+    <Content Include="umbraco.presentation\umbraco\create\member.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\create\nodeType.ascx">
-      <SubType>UserControl</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Content>
     <Content Include="umbraco.presentation\umbraco\create\simple.ascx" />
     <Content Include="umbraco.presentation\umbraco\create\xslt.ascx">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
index a3473f1f64..9f92bd8d12 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
@@ -45,7 +45,8 @@ namespace umbraco.presentation.create
                     new HttpContextWrapper(Context),
                     BasePage.Current.getUser(),
                     helper.Request("nodeType"),
-                    createMacroVal, template.SelectedValue + "|||" + rename.Text + "." + filetype.SelectedValue);
+                    createMacroVal, 
+                    template.SelectedValue + "|||" + rename.Text + "." + filetype.SelectedValue);
 
                 BasePage.Current.ClientTools
                     .ChangeContentFrameUrl(returnUrl)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
index 041a581f3e..5d6aec5ef4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
@@ -118,7 +118,6 @@ namespace umbraco.cms.presentation.create.controls
             doCreation();
         }
 
-
         private void doCreation()
         {
             if (Page.IsValid)
@@ -127,9 +126,9 @@ namespace umbraco.cms.presentation.create.controls
                     new HttpContextWrapper(Context),
                     BasePage.Current.getUser(),
                     helper.Request("nodeType"),
-                    int.Parse(nodeType.SelectedValue),
+                    int.Parse(Request["nodeID"]),
                     rename.Text,
-                    int.Parse(Request["nodeID"]));
+                    int.Parse(nodeType.SelectedValue));
 
 				BasePage.Current.ClientTools
 					.ChangeContentFrameUrl(returnUrl)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
index 4cd7cadbf7..fdc2f978a1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
@@ -73,9 +73,9 @@ namespace umbraco.cms.presentation.create.controls
 			        new HttpContextWrapper(Context),
 			        BasePage.Current.getUser(),
 			        helper.Request("nodeType"),
-			        int.Parse(nodeType.SelectedValue),
+			        int.Parse(Request["nodeID"]),                    
 			        rename.Text,
-			        int.Parse(Request["nodeID"]));
+                    int.Parse(nodeType.SelectedValue));
 
 				BasePage.Current.ClientTools
 					.ChangeContentFrameUrl(returnUrl)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
index 19e86021c3..bc7e9c5040 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
@@ -93,9 +93,9 @@ namespace umbraco.cms.presentation.create.controls
                     new HttpContextWrapper(Context),
                     BasePage.Current.getUser(),
                     helper.Request("nodeType"),
-                    memberType,
+                    -1,                    
                     rename.Text + emailAppend,
-                    -1);
+                    memberType);
 
 				BasePage.Current.ClientTools
 					.ChangeContentFrameUrl(returnUrl)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
index 13913f29e9..7c7b55419d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
@@ -66,9 +66,9 @@ namespace umbraco.cms.presentation.create.controls
                     new HttpContextWrapper(Context),
                     BasePage.Current.getUser(),
                     helper.Request("nodeType"),
-                    int.Parse(masterTypeVal),
+                    createTemplateVal,
 					rename.Text,
-                    createTemplateVal);
+                    int.Parse(masterTypeVal));
 
 				BasePage.Current.ClientTools
 					.ChangeContentFrameUrl(returnUrl)