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

Fixes merge issues

Browse Source
This commit is contained in:
Shannon
2014-01-10 00:21:58 +11:00
parent c088187a13
commit 349825b4f8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -339,7 +339,6 @@
<Compile Include="Models\TaggableObjectTypes.cs" />
<Compile Include="Models\TemplateNode.cs" />
<Compile Include="Packaging\PackageBinaryInspector.cs" />
<Compile Include="Persistence\SqlSyntax\SqlSyntaxProviderExtensions.cs" />
<Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSeven\UpdateRelatedLinksData.cs" />
<Compile Include="PropertyEditors\IValueEditor.cs" />

14
src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
View File

@@ -13,7 +13,7 @@ namespace umbraco
public override bool PerformSave()
{
var scriptFileAr = _alias.Split('\u00A4');
var scriptFileAr = Alias.Split('\u00A4');
var relPath = scriptFileAr[0];
var fileName = scriptFileAr[1];
@@ -30,25 +30,25 @@ namespace umbraco
var found = ApplicationContext.Current.Services.FileService.GetScriptByName(relPath + fileName + "." + fileType);
if (found != null)
{
m_returnUrl = string.Format("settings/scripts/editScript.aspx?file={0}{1}.{2}", relPath, fileName, fileType);
_returnUrl = string.Format("settings/scripts/editScript.aspx?file={0}{1}.{2}", relPath, fileName, fileType);
return true;
}
ApplicationContext.Current.Services.FileService.SaveScript(new Script(relPath + fileName + "." + fileType));
m_returnUrl = string.Format("settings/scripts/editScript.aspx?file={0}{1}.{2}", relPath, fileName, fileType);
_returnUrl = string.Format("settings/scripts/editScript.aspx?file={0}{1}.{2}", relPath, fileName, fileType);
return true;
}
public bool Delete()
public override bool PerformDelete()
{
if (_alias.Contains(".") == false)
if (Alias.Contains(".") == false)
{
//there is no extension so we'll assume it's a folder
ApplicationContext.Current.Services.FileService.DeleteScriptFolder(_alias.TrimStart('/'));
ApplicationContext.Current.Services.FileService.DeleteScriptFolder(Alias.TrimStart('/'));
}
else
{
ApplicationContext.Current.Services.FileService.DeleteScript(_alias.TrimStart('/'));
ApplicationContext.Current.Services.FileService.DeleteScript(Alias.TrimStart('/'));
}
return true;