Fixes: 28455
Updates ClientDependency lib to support non-url paths (instead they're absolute). ClientDependency file mappings are now unique to both computer and web root folder which will work around people deploying this folder between environments (though this still shouldn't be done) [TFS Changeset #75852]
This commit is contained in:
Binary file not shown.
@@ -111,7 +111,7 @@ Global
|
||||
GlobalSection(TeamFoundationVersionControl) = preSolution
|
||||
SccNumberOfProjects = 14
|
||||
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
|
||||
SccTeamFoundationServer = https://tfs01.codeplex.com/
|
||||
SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs01
|
||||
SccLocalPath0 = .
|
||||
SccProjectUniqueName1 = umbraco\\presentation\\umbraco.presentation.csproj
|
||||
SccProjectName1 = umbraco/presentation
|
||||
|
||||
@@ -33,19 +33,44 @@ namespace umbraco.presentation.webservices
|
||||
|
||||
TreeControl treeCtl = new TreeControl()
|
||||
{
|
||||
ShowContextMenu = showContextMenu,
|
||||
IsDialog = isDialog,
|
||||
DialogMode = dialogMode,
|
||||
App = app,
|
||||
TreeType = "",
|
||||
NodeKey = "",
|
||||
StartNodeID = -1,
|
||||
FunctionToCall = null
|
||||
ShowContextMenu = showContextMenu,
|
||||
IsDialog = isDialog,
|
||||
DialogMode = dialogMode,
|
||||
App = app,
|
||||
TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set
|
||||
NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey,
|
||||
StartNodeID = -1, //TODO: set this based on parameters!
|
||||
FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall
|
||||
};
|
||||
|
||||
Dictionary<string, string> returnVal = new Dictionary<string, string>();
|
||||
returnVal.Add("json", treeCtl.GetJSONInitNode());
|
||||
returnVal.Add("app", app);
|
||||
|
||||
if (string.IsNullOrEmpty(treeType))
|
||||
{
|
||||
//if there's not tree type specified, then render out the tree as per normal with the normal
|
||||
//way of doing things
|
||||
returnVal.Add("json", treeCtl.GetJSONInitNode());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
//get the tree that we need to render
|
||||
var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance();
|
||||
tree.ShowContextMenu = showContextMenu;
|
||||
tree.IsDialog = isDialog;
|
||||
tree.DialogMode = dialogMode;
|
||||
tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey;
|
||||
tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall;
|
||||
//this would be nice to set, but no parameters :(
|
||||
//tree.StartNodeID =
|
||||
|
||||
//now render it's start node
|
||||
XmlTree xTree = new XmlTree();
|
||||
xTree.Add(tree.RootNode);
|
||||
returnVal.Add("json", xTree.ToString());
|
||||
}
|
||||
|
||||
returnVal.Add("app", app);
|
||||
returnVal.Add("js", treeCtl.JSCurrApp);
|
||||
|
||||
return returnVal;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
|
||||
<xsl:attribute name="value">4.1.0.RC</xsl:attribute>
|
||||
<xsl:attribute name="value">4.5.1</xsl:attribute>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="/configuration/appSettings/add[@key='umbracoContentXML']/@value">
|
||||
|
||||
Reference in New Issue
Block a user