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

Merge changes from default into 6.0.0

Browse Source
This commit is contained in:
Sebastiaan Janssen
2012-12-03 16:05:32 -01:00
parent 97639040f0 3bd98d851a
commit 71410f0f12
6 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Web.UI/config/restExtensions.config
View File

@@ -2,19 +2,19 @@
<!-- this is the pre-4.10 rest configuration -->
<!-- you should use BaseRestExtensions.config instead -->
<RestExtensions>
<!-- available for backward compatibility only -->
<ext assembly="umbraco" type="umbraco.presentation.umbracobase.library.member" alias="currentMember">
<permission method="login" allowAll="true" />
<permission method="logout" allowAll="true" />
<permission method="id" allowAll="true" />
<permission method="data" allowAll="true" />
<permission method="logout" allowAll="true" />
<permission method="setProperty" allowAll="false" />
</ext>
<!-- here for backward compatibility only -->
<!-- because really, it should not be enabled by default -->
<ext assembly="Runway.Blog" type="Runway.Blog.Library.Base" alias="umbBlog">
<permission method="CreateComment" returnXml="false" allowAll="true" />
<permission method="GetGravatarImage" returnXml="false" allowAll="true" />
</ext>
<!-- available for backward compatibility only -->
<ext assembly="umbraco" type="umbraco.presentation.umbracobase.library.member" alias="currentMember">
<permission method="login" allowAll="true" />
<permission method="logout" allowAll="true" />
<permission method="id" allowAll="true" />
<permission method="data" allowAll="true" />
<permission method="logout" allowAll="true" />
<permission method="setProperty" allowAll="false" />
</ext>
<!-- here for backward compatibility only -->
<!-- because really, it should not be enabled by default -->
<ext assembly="Runway.Blog" type="Runway.Blog.Library.Base" alias="umbBlog">
<permission method="CreateComment" returnXml="false" allowAll="true" />
<permission method="GetGravatarImage" returnXml="false" allowAll="true" />
</ext>
</RestExtensions>

10
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -1419,7 +1419,15 @@ namespace umbraco
Debug.Assert(pageElements != null, "pageElements cannot be null");
try
{
string userControlPath = @"~/" + fileName;
string userControlPath = fileName;
if (!userControlPath.StartsWith("~"))
{
if (userControlPath.StartsWith("/"))
userControlPath = "~" + userControlPath;
else
userControlPath = "~/" + userControlPath;
}
if (!File.Exists(IOHelper.MapPath(userControlPath)))
return new LiteralControl(string.Format("UserControl {0} does not exist.", fileName));

4
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
View File

@@ -308,12 +308,12 @@ namespace umbraco.cms.presentation.developer
{
DirectoryInfo di = new DirectoryInfo(path);
string rootDir = IOHelper.MapPath(SystemDirectories.Root);
string rootDir = IOHelper.MapPath(SystemDirectories.Usercontrols);
foreach (FileInfo uc in di.GetFiles("*.ascx"))
{
userControlList.Items.Add(
new ListItem(
new ListItem(SystemDirectories.Usercontrols +
uc.FullName.Substring(rootDir.Length).Replace(IOHelper.DirSepChar, '/')));
/*
uc.FullName.IndexOf(usercontrolsDir),

7
src/umbraco.editorControls/userControlWrapper/usercontrolDataEditor.cs
View File

@@ -60,6 +60,13 @@ namespace umbraco.editorControls.userControlGrapper
{
base.OnInit (e);
if (!_usercontrolPath.StartsWith("~"))
{
if (_usercontrolPath.StartsWith("/"))
_usercontrolPath = "~" + _usercontrolPath;
else
_usercontrolPath = "~/" + _usercontrolPath;
}
Control oControl = new System.Web.UI.UserControl().LoadControl(_usercontrolPath);
if (HasSettings(oControl.GetType()))

2
src/umbraco.editorControls/userControlWrapper/usercontrolDataType.cs
View File

@@ -42,7 +42,7 @@ namespace umbraco.editorControls.userControlGrapper
public override string DataTypeName
{
get { return "umbraco usercontrol wrapper"; }
get { return "Umbraco Usercontrol Wrapper"; }
}
public override umbraco.interfaces.IDataPrevalue PrevalueEditor

7
src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
View File

@@ -76,14 +76,15 @@ namespace umbraco.editorControls.userControlGrapper
private void populateUserControls(string path)
{
DirectoryInfo di = new DirectoryInfo(path);
foreach (FileInfo uc in di.GetFiles("*.ascx"))
{
string root = IOHelper.MapPath(SystemDirectories.Root);
string ucRoot = IOHelper.MapPath(SystemDirectories.Usercontrols);
_dropdownlistUserControl.Items.Add(
new ListItem(
uc.FullName.Substring(root.Length).Replace(IOHelper.DirSepChar, '/'))
new ListItem( SystemDirectories.Usercontrols +
uc.FullName.Substring(ucRoot.Length).Replace(IOHelper.DirSepChar, '/'))
/*
new ListItem(