yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issues with transfering logic over to LegacyDialogHandler

Browse Source
This commit is contained in:
Shannon Deminick
2013-05-02 04:56:05 -10:00
parent 32fa920279
commit 63d52a1e12
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -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">

3
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
View File

@@ -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)

5
src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
View File

@@ -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)

4
src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
View File

@@ -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)

4
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
View File

@@ -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)

4
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
View File

@@ -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)