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

DO NOT DOWNLOAD, DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
Fixing the packager in 4.1

[TFS Changeset #64609]
This commit is contained in:
slace
2010-03-09 21:46:05 +00:00
parent 25ca49868d
commit 288892c2c6
3 changed files with 89 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
umbraco.sln
View File

@@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}"
ProjectSection(SolutionItems) = preProject
build.xml = build.xml
foreign dlls\ClientDependency.Core.dll = foreign dlls\ClientDependency.Core.dll
foreign dlls\CookComputing.XmlRpcV2.dll = foreign dlls\CookComputing.XmlRpcV2.dll
default.build = default.build
foreign dlls\IronMath.dll = foreign dlls\IronMath.dll

59
umbraco/presentation/umbraco/config/create/UI.xml
View File

@@ -249,30 +249,30 @@
<create assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="initscripts">
<header>Script file</header>
<usercontrol>/create/script.ascx</usercontrol>
@@ -295,7 +295,7 @@
<delete assembly="umbraco" type="ScriptTasks" />
</tasks>
</nodeType>
<nodeType alias="initpackager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -303,6 +303,13 @@
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="packager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="createdPackages">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -325,5 +332,5 @@
<delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
</tasks>
</nodeType>
</createUI>

105
umbraco/presentation/umbraco/create.aspx.cs
View File

@@ -15,56 +15,63 @@ using umbraco.IO;
namespace umbraco.cms.presentation
{
/// <summary>
/// Summary description for create.
/// </summary>
public partial class Create : BasePages.UmbracoEnsuredPage
{
protected umbWindow createWindow;
protected System.Web.UI.WebControls.Label helpText;
protected System.Web.UI.WebControls.TextBox rename;
protected System.Web.UI.WebControls.Label Label1;
protected System.Web.UI.WebControls.ListBox nodeType;
protected void Page_Load(object sender, System.EventArgs e)
{
// Load create definitions
try
{
XmlDocument createDef = new XmlDocument();
XmlTextReader defReader = new XmlTextReader( IOHelper.MapPath(SystemFiles.CreateUiXml ) );
createDef.Load(defReader);
defReader.Close();
/// <summary>
/// Summary description for create.
/// </summary>
public partial class Create : BasePages.UmbracoEnsuredPage
{
protected umbWindow createWindow;
protected System.Web.UI.WebControls.Label helpText;
protected System.Web.UI.WebControls.TextBox rename;
protected System.Web.UI.WebControls.Label Label1;
protected System.Web.UI.WebControls.ListBox nodeType;
// Find definition for current nodeType
XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + Request.QueryString["nodeType"] + "']");
//title.Text = ui.Text("create") + " " + ui.Text(def.SelectSingleNode("./header").FirstChild.Value.ToLower(), base.getUser());
//headerTitle.Text = title.Text;
UI.Controls.Add(new UserControl().LoadControl( SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value));
}
catch (Exception ex) {
throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + Request.QueryString["nodeType"], ex);
}
}
protected void Page_Load(object sender, System.EventArgs e)
{
// Load create definitions
string nodeType = Request.QueryString["nodeType"];
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web Form Designer.
//
InitializeComponent();
base.OnInit(e);
}
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
XmlDocument createDef = new XmlDocument();
XmlTextReader defReader = new XmlTextReader(IOHelper.MapPath(SystemFiles.CreateUiXml));
createDef.Load(defReader);
defReader.Close();
}
#endregion
}
// Find definition for current nodeType
XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + nodeType + "']");
if (def == null)
{
throw new ArgumentException("The create dialog for \"" + nodeType + "\" does not match anything defined in the \"" + SystemFiles.CreateUiXml + "\". This could mean an incorrectly installed package or a corrupt UI file");
}
//title.Text = ui.Text("create") + " " + ui.Text(def.SelectSingleNode("./header").FirstChild.Value.ToLower(), base.getUser());
try
{
//headerTitle.Text = title.Text;
UI.Controls.Add(new UserControl().LoadControl(SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value));
}
catch (Exception ex)
{
throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + nodeType, ex);
}
}
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web Form Designer.
//
InitializeComponent();
base.OnInit(e);
}
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
}
#endregion
}
}