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

Fixed merge issue based on overlap with class + namespace name.

Browse Source
This commit is contained in:
Shannon Deminick
2013-03-29 23:52:40 +06:00
parent 48c809a797
commit 13e555f50b
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -277,13 +277,6 @@
<DependentUpon>loadStarterKits.ascx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Umbraco\Create\PartialViewMacro.ascx.cs">
<DependentUpon>PartialViewMacro.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Umbraco\Create\PartialViewMacro.ascx.designer.cs">
<DependentUpon>PartialViewMacro.ascx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Create.aspx.cs">
<DependentUpon>create.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -291,6 +284,13 @@
<Compile Include="Umbraco\Create.aspx.designer.cs">
<DependentUpon>create.aspx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Create\PartialViewMacro.ascx.cs">
<DependentUpon>PartialViewMacro.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Umbraco\Create\PartialViewMacro.ascx.designer.cs">
<DependentUpon>PartialViewMacro.ascx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Developer\Macros\EditMacro.aspx.cs">
<DependentUpon>editMacro.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -434,6 +434,7 @@
<Content Include="Umbraco\Config\Lang\ru.xml" />
<Content Include="Umbraco\Config\Lang\zh.xml" />
<Content Include="Umbraco\Controls\Tree\CustomTreeService.asmx" />
<Content Include="Umbraco\create.aspx" />
<Content Include="Umbraco\Create\PartialViewMacro.ascx" />
<Content Include="Umbraco\Dashboard\Images\access-denied.png" />
<Content Include="Umbraco\Dashboard\Scripts\swfobject.js" />
@@ -1913,7 +1914,6 @@
<Content Include="Umbraco\Translation\default.aspx" />
<Content Include="Umbraco\Translation\preview.aspx" />
<Content Include="Umbraco\Translation\xml.aspx" />
<Content Include="Umbraco\create.aspx" />
<Content Include="Umbraco\Create\content.ascx" />
<Content Include="Umbraco\Create\language.ascx">
<SubType>UserControl</SubType>

2
src/Umbraco.Web.UI/umbraco/Create.aspx.cs
View File

@@ -9,7 +9,7 @@ using umbraco.cms.presentation.Trees;
namespace Umbraco.Web.UI.Umbraco
{
public partial class Create : global::umbraco.cms.presentation.Create
public partial class CreateDialog : global::umbraco.cms.presentation.Create
{
//protected override void OnLoad(EventArgs e)

7
src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs generated
View File

@@ -8,9 +8,10 @@
//------------------------------------------------------------------------------
namespace Umbraco.Web.UI.Umbraco {
public partial class Create {
public partial class CreateDialog
{
/// <summary>
/// AccessError control.

2
src/Umbraco.Web.UI/umbraco/create.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="Create.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Create" %>
<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="CreateDialog.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.CreateDialog" %>
<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>

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

@@ -359,9 +359,9 @@
<Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
<Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\MacroPartialViewTasks.cs" />
<Compile Include="umbraco.presentation\umbraco\create\PartialViewTasks.cs" />
</Compile>
<Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>