diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddInstructionCountColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddInstructionCountColumn.cs index 920f319fea..52996c85d5 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddInstructionCountColumn.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddInstructionCountColumn.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Linq; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.SqlSyntax; diff --git a/src/Umbraco.Core/Persistence/PetaPocoCommandExtensions.cs b/src/Umbraco.Core/Persistence/PetaPocoCommandExtensions.cs index f1b41f2420..72829d8df4 100644 --- a/src/Umbraco.Core/Persistence/PetaPocoCommandExtensions.cs +++ b/src/Umbraco.Core/Persistence/PetaPocoCommandExtensions.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using System.Data.SqlClient; using Umbraco.Core.Persistence.FaultHandling; namespace Umbraco.Core.Persistence diff --git a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs index 8626714a43..8a75805727 100644 --- a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs +++ b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs @@ -1,16 +1,12 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.Common; using System.Data.SqlClient; using System.Data.SqlServerCe; using System.Linq; using System.Text.RegularExpressions; -using MySql.Data.MySqlClient; using StackExchange.Profiling.Data; using Umbraco.Core.Logging; -using Umbraco.Core.Persistence.DatabaseModelDefinitions; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index fa907b0e05..c8c94c9e12 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -889,7 +889,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", public void AddOrUpdatePermissions(ContentPermissionSet permission) { _permissionRepository.AddOrUpdate(permission); - } + } /// /// Used to remove the content xml for a content item @@ -1063,8 +1063,8 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", } #endregion } - #endregion - + #endregion + protected override string GetDatabaseFieldNameForOrderBy(string orderBy) { //Some custom ones diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 8962d5a356..51d1cd2bd2 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Text; using System.Text.RegularExpressions; using System.Xml.Linq; using Umbraco.Core.Configuration.UmbracoSettings; @@ -102,14 +101,14 @@ namespace Umbraco.Core.Persistence.Repositories { sql.InnerJoin(SqlSyntax) .On(SqlSyntax, left => left.VersionId, right => right.VersionId); - } - + } + //TODO: IF we want to enable querying on content type information this will need to be joined //.InnerJoin(SqlSyntax) //.On(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax); sql.Where(x => x.NodeObjectType == NodeObjectTypeId, SqlSyntax); return sql; - } + } protected override Sql GetBaseQuery(BaseQueryType queryType) { @@ -442,7 +441,7 @@ namespace Umbraco.Core.Persistence.Repositories //Create the Media specific data for this version - cmsMedia //Assumes a new Version guid has been generated dto.NodeId = nodeDto.NodeId; - Database.Insert(dto); + Database.Insert(dto); //Create the PropertyData for this version - cmsPropertyData var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id); @@ -515,8 +514,8 @@ namespace Umbraco.Core.Persistence.Repositories dto.ContentVersionDto.Id = contentVerDto.Id; //Updates the current version - cmsContentVersion //Assumes a Version guid exists and Version date (modified date) has been set/updated - Database.Update(dto.ContentVersionDto); - + Database.Update(dto.ContentVersionDto); + //now update the media entry Database.Update(dto); @@ -661,9 +660,9 @@ namespace Umbraco.Core.Persistence.Repositories throw new NotImplementedException(); } #endregion - } - #endregion - + } + #endregion + /// /// Gets an object from the path stored in the for the media item. /// @@ -682,7 +681,7 @@ namespace Umbraco.Core.Persistence.Repositories var underscoreIndex = mediaPath.LastIndexOf('_'); var dotIndex = mediaPath.LastIndexOf('.'); umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex)); - } + } var sql = GetBaseQuery(BaseQueryType.FullSingle, true); sql.Where(mediaDto => mediaDto.MediaPath == umbracoFileValue, SqlSyntax); @@ -694,7 +693,7 @@ namespace Umbraco.Core.Persistence.Repositories var content = CreateMediaFromDto(dto, sql); return content; - } + } /// /// Gets paged media results @@ -758,8 +757,8 @@ namespace Umbraco.Core.Persistence.Repositories if (EnsureUniqueNaming == false) return nodeName; - var names = Database.Fetch("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId", - new { objectType = NodeObjectTypeId, parentId }); + var names = Database.Fetch("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId", + new { objectType = NodeObjectTypeId, parentId }); return SimilarNodeName.GetUniqueName(names, id, nodeName); } diff --git a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs index 5904d9da1c..b255f2eab6 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs @@ -1,14 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Models.Rdbms; - using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Persistence.UnitOfWork; diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs index 91f8173304..f514ee80df 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs @@ -4,7 +4,6 @@ using System.Linq; using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.Models.EntityBase; - using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Core.Scoping; diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 9cb6f44562..80d0a8975e 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -2449,8 +2449,8 @@ namespace Umbraco.Core.Services //TODO: Horrible for performance if there are lots of descendents! We should page if anything but this is crazy var descendants = GetPublishedDescendants(content); _publishingStrategy.PublishingFinalized(uow, descendants, false); - } - + } + Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id); uow.Commit(); return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus); diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs index a970e20d01..37afac3caa 100644 --- a/src/Umbraco.Core/Services/MediaService.cs +++ b/src/Umbraco.Core/Services/MediaService.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using System.Globalization; using System.IO; using System.Linq; -using System.Text.RegularExpressions; using System.Threading; using System.Xml.Linq; using Umbraco.Core.Configuration; @@ -12,7 +11,6 @@ using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; -using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Querying; @@ -43,7 +41,7 @@ namespace Umbraco.Core.Services if (userService == null) throw new ArgumentNullException("userService"); _dataTypeService = dataTypeService; _userService = userService; - } + } /// /// Creates an object using the alias of the @@ -63,7 +61,7 @@ namespace Umbraco.Core.Services { var parent = GetById(parentId); return CreateMedia(name, parent, mediaTypeAlias, userId); - } + } /// /// Creates an object using the alias of the @@ -966,7 +964,7 @@ namespace Umbraco.Core.Services if (raiseEvents) { - saveEventArgs.CanCancel = false; + saveEventArgs.CanCancel = false; uow.Events.Dispatch(Saved, this, saveEventArgs); } diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 1364a8e2af..e8b0550741 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Globalization; using System.IO; using System.Net; using System.Net.Http; @@ -23,9 +22,7 @@ using Umbraco.Web.Models.Mapping; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; using System.Linq; -using System.Text.RegularExpressions; using System.Web.Http.Controllers; -using Examine; using Umbraco.Web.WebApi.Binders; using Umbraco.Web.WebApi.Filters; using Constants = Umbraco.Core.Constants; @@ -33,8 +30,8 @@ using Umbraco.Core.Configuration; using Umbraco.Web.UI; using Notification = Umbraco.Web.Models.ContentEditing.Notification; using Umbraco.Core.Persistence; -using Umbraco.Core.Configuration.UmbracoSettings; - +using Umbraco.Core.Configuration.UmbracoSettings; + namespace Umbraco.Web.Editors { /// @@ -602,8 +599,8 @@ namespace Umbraco.Web.Editors public MediaItemDisplay PostAddFolder(PostedFolder folder) { - var intParentId = GetParentIdAsInt(folder.ParentId, validatePermissions:true); - + var intParentId = GetParentIdAsInt(folder.ParentId, validatePermissions:true); + var mediaService = ApplicationContext.Services.MediaService; var f = mediaService.CreateMedia(folder.Name, intParentId, Constants.Conventions.MediaTypes.Folder); @@ -638,10 +635,10 @@ namespace Umbraco.Web.Editors if (result.FileData.Count == 0) { return Request.CreateResponse(HttpStatusCode.NotFound); - } - + } + //get the string json from the request - string currentFolderId = result.FormData["currentFolder"]; + string currentFolderId = result.FormData["currentFolder"]; int parentId = GetParentIdAsInt(currentFolderId, validatePermissions: true); var tempFiles = new PostedFiles(); @@ -842,7 +839,7 @@ namespace Umbraco.Web.Editors } return intParentId; - } + } /// /// Ensures the item can be moved/copied to the new location @@ -917,7 +914,7 @@ namespace Umbraco.Web.Editors if (storage == null) throw new ArgumentNullException("storage"); if (user == null) throw new ArgumentNullException("user"); if (mediaService == null) throw new ArgumentNullException("mediaService"); - if (entityService == null) throw new ArgumentNullException("entityService"); + if (entityService == null) throw new ArgumentNullException("entityService"); if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia) { @@ -930,7 +927,7 @@ namespace Umbraco.Web.Editors if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia) { throw new HttpResponseException(HttpStatusCode.NotFound); - } + } var hasPathAccess = (nodeId == Constants.System.Root) ? user.HasMediaRootAccess(entityService)