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

Web proj is building

Browse Source
This commit is contained in:
Shannon
2015-12-18 14:58:22 +01:00
parent f09f3c4129
commit 73cc4b4e3f
10 changed files with 44 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -3,14 +3,12 @@ using System.Linq;
using System.Net;
using System.Net.Http;
using System.Collections.Generic;
using System.Security.Claims;
using System.ServiceModel.Channels;
using System.Threading.Tasks;
using System.Web.Http;
using AutoMapper;
using Microsoft.AspNet.Identity;
using Microsoft.Owin;
using Microsoft.Owin.Security;
using Umbraco.Core;
using Umbraco.Web.Models;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Mvc;
@@ -20,10 +18,8 @@ using Umbraco.Web.WebApi;
using Umbraco.Web.WebApi.Filters;
using Microsoft.AspNet.Identity.Owin;
using Umbraco.Core.Logging;
using Newtonsoft.Json.Linq;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Configuration;
using Umbraco.Web.Security.Identity;
using IUser = Umbraco.Core.Models.Membership.IUser;
namespace Umbraco.Web.Editors
{

4
src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
View File

@@ -31,7 +31,9 @@ namespace Umbraco.Web.Install.InstallSteps
{
LogHelper.Info<DatabaseUpgradeStep>("Running 'Upgrade' service");
var result = _applicationContext.DatabaseContext.UpgradeSchemaAndData(_applicationContext.Services.MigrationEntryService);
var result = _applicationContext.DatabaseContext.UpgradeSchemaAndData(
_applicationContext.Services.MigrationEntryService,
MigrationResolver.Current);
if (result.Success == false)
{

2
src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs
View File

@@ -13,7 +13,7 @@ using umbraco.BusinessLogic.Utils;
namespace Umbraco.Web.Media.ThumbnailProviders
{
public sealed class ThumbnailProvidersResolver : ManyObjectsResolverBase<ThumbnailProvidersResolver, IThumbnailProvider>
public sealed class ThumbnailProvidersResolver : ContainerManyObjectsResolver<ThumbnailProvidersResolver, IThumbnailProvider>
{
/// <summary>
/// Constructor

10
src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors
@@ -6,6 +7,13 @@ namespace Umbraco.Web.PropertyEditors
[PropertyEditor(Constants.PropertyEditors.DecimalAlias, "Decimal", "decimal", "decimal", IsParameterEditor = true)]
public class DecimalPropertyEditor : PropertyEditor
{
/// <summary>
/// The constructor will setup the property editor based on the attribute if one is found
/// </summary>
public DecimalPropertyEditor(ILogger logger) : base(logger)
{
}
/// <summary>
/// Overridden to ensure that the value is validated
/// </summary>
@@ -53,5 +61,7 @@ namespace Umbraco.Web.PropertyEditors
});
}
}
}
}

7
src/Umbraco.Web/PropertyEditors/FolderBrowserPropertyEditor.cs
View File

@@ -13,6 +13,11 @@ namespace Umbraco.Web.PropertyEditors
[PropertyEditor(Constants.PropertyEditors.FolderBrowserAlias, "(Obsolete) Folder Browser", "folderbrowser", HideLabel=true, Icon="icon-folder", Group="media")]
public class FolderBrowserPropertyEditor : PropertyEditor
{
/// <summary>
/// The constructor will setup the property editor based on the attribute if one is found
/// </summary>
public FolderBrowserPropertyEditor(ILogger logger) : base(logger)
{
}
}
}

4
src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
View File

@@ -93,9 +93,7 @@ namespace Umbraco.Web.Security.Identity
//check installer
|| request.Uri.IsInstallerRequest()
//detect in preview
|| (request.HasPreviewCookie() && request.Uri != null && request.Uri.AbsolutePath.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)) == false)
//check for base
|| BaseRest.BaseRestHandler.IsBaseRestRequest(originalRequestUrl))
|| (request.HasPreviewCookie() && request.Uri != null && request.Uri.AbsolutePath.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)) == false))
{
return true;
}

90
src/Umbraco.Web/umbraco.presentation/content.cs
View File

@@ -11,7 +11,6 @@ using umbraco.BusinessLogic;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.web;
using umbraco.DataLayer;
using umbraco.presentation.nodeFactory;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
@@ -23,7 +22,6 @@ using Umbraco.Web;
using Umbraco.Web.PublishedCache.XmlPublishedCache;
using Umbraco.Web.Scheduling;
using File = System.IO.File;
using Node = umbraco.NodeFactory.Node;
using Task = System.Threading.Tasks.Task;
namespace umbraco
@@ -198,28 +196,7 @@ namespace umbraco
var attr = ((XmlElement)node).GetAttributeNode("sortOrder");
attr.Value = d.sortOrder.ToString();
xmlContentCopy = GetAddOrUpdateXmlNode(xmlContentCopy, d.Id, d.Level, parentId, node);
// update sitemapprovider
if (updateSitemapProvider && SiteMap.Provider is UmbracoSiteMapProvider)
{
try
{
var prov = (UmbracoSiteMapProvider)SiteMap.Provider;
var n = new Node(d.Id, true);
if (string.IsNullOrEmpty(n.Url) == false && n.Url != "/#")
{
prov.UpdateNode(n);
}
else
{
LogHelper.Debug<content>(string.Format("Can't update Sitemap Provider due to empty Url in node id: {0}", d.Id));
}
}
catch (Exception ee)
{
LogHelper.Error<content>(string.Format("Error adding node to Sitemap Provider in PublishNodeDo(): {0}", d.Id), ee);
}
}
}
return xmlContentCopy;
@@ -243,9 +220,7 @@ namespace umbraco
/// <param name="parentId">The parent node identifier.</param>
public void SortNodes(int parentId)
{
var childNodesXPath = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema
? "./node"
: "./* [@id]";
var childNodesXPath = "./* [@id]";
using (var safeXml = GetSafeXmlWriter(false))
{
@@ -422,13 +397,7 @@ namespace umbraco
//SD: changed to fire event BEFORE running the sitemap!! argh.
FireAfterClearDocumentCache(doc, e);
// update sitemapprovider
if (SiteMap.Provider is UmbracoSiteMapProvider)
{
var prov = (UmbracoSiteMapProvider)SiteMap.Provider;
prov.RemoveNode(doc.Id);
}
}
}
@@ -624,37 +593,14 @@ order by umbracoNode.level, umbracoNode.sortOrder";
if (hierarchy.TryGetValue(parentId, out children))
{
XmlNode childContainer = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ||
String.IsNullOrEmpty(UmbracoSettings.TEMP_FRIENDLY_XML_CHILD_CONTAINER_NODENAME)
? parentNode
: parentNode.SelectSingleNode(
UmbracoSettings.TEMP_FRIENDLY_XML_CHILD_CONTAINER_NODENAME);
if (!UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema &&
!String.IsNullOrEmpty(UmbracoSettings.TEMP_FRIENDLY_XML_CHILD_CONTAINER_NODENAME))
{
if (childContainer == null)
{
childContainer = xmlHelper.addTextNode(parentNode.OwnerDocument,
UmbracoSettings.
TEMP_FRIENDLY_XML_CHILD_CONTAINER_NODENAME, "");
parentNode.AppendChild(childContainer);
}
}
XmlNode childContainer = parentNode;
foreach (int childId in children)
{
XmlNode childNode = nodeIndex[childId];
if (UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ||
String.IsNullOrEmpty(UmbracoSettings.TEMP_FRIENDLY_XML_CHILD_CONTAINER_NODENAME))
{
parentNode.AppendChild(childNode);
}
else
{
childContainer.AppendChild(childNode);
}
parentNode.AppendChild(childNode);
// Recursively build the content tree under the current child
GenerateXmlDocument(hierarchy, nodeIndex, childId, childNode);
@@ -717,13 +663,7 @@ order by umbracoNode.level, umbracoNode.sortOrder";
private static bool XmlIsImmutable
{
get { return UmbracoConfig.For.UmbracoSettings().Content.CloneXmlContent; }
}
// whether to use the legacy schema
private static bool UseLegacySchema
{
get { return UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema; }
}
}
// whether to keep version of everything (incl. medias & members) in cmsPreviewXml
// for audit purposes - false by default, not in umbracoSettings.config
@@ -969,22 +909,12 @@ order by umbracoNode.level, umbracoNode.sortOrder";
private static string ChildNodesXPath
{
get
{
return UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema
? "./node"
: "./* [@id]";
}
get { return "./* [@id]"; }
}
private static string DataNodesXPath
{
get
{
return UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema
? "./data"
: "./* [not(@id)]";
}
get { return "./* [not(@id)]"; }
}
#endregion
@@ -1209,7 +1139,7 @@ order by umbracoNode.level, umbracoNode.sortOrder";
// if the document is not there already then it's a new document
// we must make sure that its document type exists in the schema
if (currentNode == null && UseLegacySchema == false)
if (currentNode == null)
{
var xml2 = EnsureSchema(docNode.Name, xml);
if (ReferenceEquals(xml, xml2) == false)

3
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
View File

@@ -1,4 +1,5 @@
using System.Text;
using System;
using System.Text;
using System.Xml;
using Umbraco.Core.Security;
using umbraco.businesslogic;

2
src/UmbracoExamine/UmbracoMemberIndexer.cs
View File

@@ -28,6 +28,7 @@ namespace UmbracoExamine
{
private readonly IMemberService _memberService;
private readonly IDataTypeService _dataTypeService;
/// <summary>
/// Default constructor
@@ -36,6 +37,7 @@ namespace UmbracoExamine
: base()
{
_memberService = ApplicationContext.Current.Services.MemberService;
_dataTypeService = ApplicationContext.Current.Services.DataTypeService;
}
/// <summary>

8
src/umbraco.cms/businesslogic/Dictionary.cs
View File

@@ -90,7 +90,13 @@ namespace umbraco.cms.businesslogic
throw new ArgumentException("No id " + id + " exists in dictionary");
}
}
[Obsolete("This is no longer used and will be removed from the codebase in future versions")]
public bool IsTopMostItem()
{
return _dictionaryItem.ParentId.HasValue == false;
}
/// <summary>
/// Returns the parent.
/// </summary>