From d961dc9b505946fbee295ed319ee43ce63c70eff Mon Sep 17 00:00:00 2001 From: PerPloug Date: Thu, 18 Feb 2010 21:00:58 +0000 Subject: [PATCH] WORK IN PROGRESS, GET STABLE SOURCE FROM DOWNLOAD TAB wrong drl dialog file, turns off examine, adds missing dll for microsoft scripting [TFS Changeset #64068] --- .../Microsoft.Scripting.ExtensionAttribute.dll | Bin 0 -> 12112 bytes umbraco.sln | 2 +- umbraco/cms/umbraco.cms.csproj | 2 +- .../presentation/config/ExamineSettings.config | 2 +- .../presentation/umbraco.presentation.csproj | 4 ++++ .../umbraco/create/standardTasks.cs | 2 +- .../developer/Packages/BrowseRepository.aspx.cs | 2 +- .../Application/UmbracoApplicationActions.js | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll diff --git a/foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll b/foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll new file mode 100644 index 0000000000000000000000000000000000000000..e8ddeac08ee07c47be2834fb82180aa2806aa42f GIT binary patch literal 12112 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 VWzz=UZuR$kXDnB&Dcs$t`ET52kaYk6 literal 0 HcmV?d00001 diff --git a/umbraco.sln b/umbraco.sln index 523bccc6a8..fb743e4cb7 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll foreign dlls\Microsoft.Scripting.Core.dll = foreign dlls\Microsoft.Scripting.Core.dll foreign dlls\Microsoft.Scripting.dll = foreign dlls\Microsoft.Scripting.dll + foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll = foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll foreign dlls\System.Web.Abstractions.dll = foreign dlls\System.Web.Abstractions.dll foreign dlls\System.Web.Abstractions.xml = foreign dlls\System.Web.Abstractions.xml @@ -24,7 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution umbraco.build = umbraco.build foreign dlls\umbraco.Linq.DTMetal.Engine.dll = foreign dlls\umbraco.Linq.DTMetal.Engine.dll foreign dlls\UrlRewritingNet.UrlRewriter.dll = foreign dlls\UrlRewritingNet.UrlRewriter.dll - foreign dlls\VistaDB For Umbraco.dll = foreign dlls\VistaDB For Umbraco.dll foreign dlls\VistaDB.NET20.dll = foreign dlls\VistaDB.NET20.dll EndProjectSection EndProject diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj index 9373e8e615..e231546e4e 100644 --- a/umbraco/cms/umbraco.cms.csproj +++ b/umbraco/cms/umbraco.cms.csproj @@ -83,7 +83,7 @@ False ..\..\foreign dlls\ClientDependency.Core.dll - + False ..\..\foreign dlls\ICSharpCode.SharpZipLib.dll diff --git a/umbraco/presentation/config/ExamineSettings.config b/umbraco/presentation/config/ExamineSettings.config index 1e8bf7af45..4b334a3c61 100644 --- a/umbraco/presentation/config/ExamineSettings.config +++ b/umbraco/presentation/config/ExamineSettings.config @@ -8,7 +8,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami --> - + False ..\..\foreign dlls\Microsoft.Scripting.Core.dll + + False + ..\..\foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll + System diff --git a/umbraco/presentation/umbraco/create/standardTasks.cs b/umbraco/presentation/umbraco/create/standardTasks.cs index 0722c6375a..b87bc28283 100644 --- a/umbraco/presentation/umbraco/create/standardTasks.cs +++ b/umbraco/presentation/umbraco/create/standardTasks.cs @@ -222,7 +222,7 @@ namespace umbraco { cms.businesslogic.macro.Macro m = cms.businesslogic.macro.Macro.MakeNew( helper.SpaceCamelCasing(fileName.Substring(0, (fileName.LastIndexOf('.') + 1)).Trim('.'))); - m.ScriptingFile = _alias; + m.ScriptingFile = fileName; } m_returnUrl = string.Format(SystemDirectories.Umbraco + "/developer/python/editPython.aspx?file={0}", fileName); diff --git a/umbraco/presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/umbraco/presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs index 9bbe8ceb64..ddefa4d7c6 100644 --- a/umbraco/presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs +++ b/umbraco/presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs @@ -34,7 +34,7 @@ namespace umbraco.presentation.developer.packages { if (!string.IsNullOrEmpty(category)) category = "&category=" + category; - iframeGen.Text = ""; + iframeGen.Text = ""; } #region Web Form Designer generated code diff --git a/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js b/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js index 1516b6acb9..25bd4d112b 100644 --- a/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js +++ b/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js @@ -257,7 +257,7 @@ Umbraco.Application.Actions = function() { UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380); } else if (actionNode.nodeType == "initpython" || actionNode.nodeType == "initdlrscripting") { - UmbClientMgr.mainWindow().openModal("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], 380, 420); + UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380); } else { UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 270);