From ed019a90e2b43208eb85a8e7b84fdd78f3c3116f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Jan 2017 14:25:10 +0100 Subject: [PATCH 01/58] start on mini list view for pickers --- .../src/less/components/umb-table.less | 13 ++ .../treepicker/treepicker.controller.js | 100 ++++++++++++- .../overlays/treepicker/treepicker.html | 141 ++++++++++++++---- 3 files changed, 216 insertions(+), 38 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index bc8e19cf2b..7f4afc3de7 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -256,3 +256,16 @@ input.umb-table__input { flex: 1 1 25%; max-width: 25%; } + +.umb-table--condensed { + + .umb-table-cell:first-of-type:not(.not-fixed) { + padding-top: 10px; + padding-bottom: 10px; + } + + .umb-table-body__icon { + font-size: 20px; + } + +} diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index e69b5ee3ce..8bcf427d7e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -1,6 +1,6 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", - function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService) { + function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource) { var tree = null; var dialogOptions = $scope.model; @@ -106,13 +106,16 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", //iterate children _.each(args.children, function (child) { + console.log("child", child); + //check if any of the items are list views, if so we need to add some custom // children: A node to activate the search, any nodes that have already been // selected in the search if (child.metaData.isContainer) { child.hasChildren = true; child.children = [ - { + { + id: child.id, level: child.level + 1, hasChildren: false, parent: function () { @@ -177,13 +180,26 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", if (args.node.metaData.listViewNode) { //check if list view 'search' node was selected - $scope.searchInfo.showSearch = true; - $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id; - $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name; + //alert("list view"); + + $scope.showMiniListView = true; + + console.log(args); + + $scope.pagination = { + pageSize: 10, + pageNumber: 1, + filter: '', + orderDirection: "Ascending", + orderBy: "SortOrder", + orderBySystemField: true + }; + + getPagedChildren(args.node); + + $scope.miniListView.nodeName = args.node.metaData.listViewNode.name; + $scope.miniListView.nodeId = args.node.metaData.listViewNode.id; - //add transition classes - var listViewNode = args.node.parent(); - listViewNode.cssClasses.push('tree-node-slide-up-hide-active'); } else if (args.node.metaData.isSearchResult) { //check if the item selected was a search result from a list view @@ -504,4 +520,72 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler); $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); }); + + /* Mini List View */ + $scope.miniListView = {}; + + $scope.nextPage = function(pageNumber) { + $scope.pagination.pageNumber = pageNumber; + getPagedChildren($scope.miniListView.node); + }; + + $scope.prevPage = function(pageNumber) { + $scope.pagination.pageNumber = pageNumber; + getPagedChildren($scope.miniListView.node); + }; + + $scope.goToPage = function(pageNumber) { + $scope.pagination.pageNumber = pageNumber; + getPagedChildren($scope.miniListView.node); + }; + + $scope.selectListViewItem = function(item) { + select(item.name, item.id); + //toggle checked state + item.selected = item.selected === true ? false : true; + }; + + $scope.exitMiniListView = function() { + console.log($scope.miniListView); + $scope.showMiniListView = false; + }; + + $scope.searchMiniListView = function() { + searchMiniListView(); + }; + + function getPagedChildren(node) { + + // start load indicator + $scope.miniListView.loading = true; + + contentResource.getChildren(node.id, $scope.pagination) + .then(function (data) { + + // update children + $scope.miniListView.node = node; + $scope.miniListView.children = data.items; + + // update pagination + $scope.pagination.totalItems = data.totalItems; + $scope.pagination.totalPages = data.totalPages; + + // stop load indicator + $scope.miniListView.loading = false; + + }); + + } + + var searchMiniListView = _.debounce(function () { + + $scope.$apply(function () { + if ($scope.pagination.filter !== null && $scope.pagination.filter !== undefined) { + $scope.pagination.pageNumber = 1; + getPagedChildren($scope.miniListView.node, $scope.pagination); + } + }); + + }, 500); + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index b009b4d45f..fe2c479e4e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -1,35 +1,116 @@
-
- - -
+
+
+ + +
- - + + -
- - -
+
+ + +
+
-
+
+ +
+
+ + + +

{{ miniListView.nodeName }}

+
+
+ +
+ + +
+
+
+ +
+ Name +
+
+
+
+ + +
+
+
+
+
+ + +
+ + +
+
+ + +
+
{{ child.name }}
+
+ + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ + \ No newline at end of file From 4336f5201d3f5efd3cd09a4d608f892e67fb50d5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Jan 2017 22:34:04 +0100 Subject: [PATCH 02/58] show expand arrow for list views --- .../directives/components/tree/umbtreeitem.directive.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js index f4fe0db4e6..e519bb78b0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js @@ -74,11 +74,14 @@ angular.module("umbraco.directives") //toggle visibility of last 'ins' depending on children //visibility still ensure the space is "reserved", so both nodes with and without children are aligned. - if (!node.hasChildren) { - element.find("ins").last().css("visibility", "hidden"); + + console.log(node); + + if (node.hasChildren || node.metaData.isContainer) { + element.find("ins").last().css("visibility", "visible"); } else { - element.find("ins").last().css("visibility", "visible"); + element.find("ins").last().css("visibility", "hidden"); } var icon = element.find("i:first"); From bf797bccc7ea09966cd2ad6c31e39206d2a12d1b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Jan 2017 22:35:19 +0100 Subject: [PATCH 03/58] open list view on expand --- .../treepicker/treepicker.controller.js | 44 +++++++++++++++++-- .../overlays/treepicker/treepicker.html | 15 ++++--- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 8bcf427d7e..a1ee1f031f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -1,6 +1,6 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", - function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource) { + function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource, mediaResource, memberResource) { var tree = null; var dialogOptions = $scope.model; @@ -101,6 +101,13 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } function nodeExpandedHandler(ev, args) { + + console.log("args", args); + + if (args.node.metaData.isContainer) { + openMiniListView(args.node); + } + if (angular.isArray(args.children)) { //iterate children @@ -111,6 +118,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", //check if any of the items are list views, if so we need to add some custom // children: A node to activate the search, any nodes that have already been // selected in the search + /* if (child.metaData.isContainer) { child.hasChildren = true; child.children = [ @@ -151,6 +159,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }); }); } + */ //now we need to look in the already selected search results and // toggle the check boxes for those ones that are listed @@ -554,16 +563,43 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", searchMiniListView(); }; + function openMiniListView(node) { + + $scope.showMiniListView = true; + + $scope.pagination = { + pageSize: 10, + pageNumber: 1, + filter: '', + orderDirection: "Ascending", + orderBy: "SortOrder", + orderBySystemField: true + }; + + getPagedChildren(node); + + } + function getPagedChildren(node) { // start load indicator + $scope.miniListView.node = node; $scope.miniListView.loading = true; + + var promise = ""; - contentResource.getChildren(node.id, $scope.pagination) + if(node.nodeType === "content") { + promise = contentResource.getChildren(node.id, $scope.pagination); + } else if( node.nodeType === "member") { + promise = memberResource.getPagedResults(node.id, $scope.pagination); + } else if(node.nodeType === "media") { + promise = mediaResource.getChildren(node.id, $scope.pagination); + } + + promise .then(function (data) { - + // update children - $scope.miniListView.node = node; $scope.miniListView.children = data.items; // update pagination diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index fe2c479e4e..a37a63bb0f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -1,6 +1,7 @@
+
-
+
+
-
+
- - + + Back -

{{ miniListView.nodeName }}

+

+ + {{ miniListView.node.name }} +

From f192f241cfef14ca19f81ef7b772db8e98b7773f Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 31 Jan 2017 13:48:47 +1100 Subject: [PATCH 04/58] U4-9450 Paged data queries return all property data in the entire database, not just for the paged subset --- .../Repositories/ContentRepository.cs | 9 +++++---- .../Persistence/Repositories/MediaRepository.cs | 10 +++++----- .../Repositories/MemberRepository.cs | 10 +++++----- .../Repositories/VersionableRepositoryBase.cs | 17 +++++++++++------ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index b02f5304e6..f7b88ef46b 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -859,7 +859,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsDocument", "nodeId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged:true), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -899,9 +899,10 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", /// /// The Id SQL without the outer join to just return all document ids - used to process the properties for the content item /// + /// True if this is a paged query /// /// - private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false) + private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sqlFull); @@ -967,7 +968,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", .ToDictionary(x => x.Id, x => x); // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sqlIds, defs); + var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); // assign var dtoIndex = 0; @@ -1014,7 +1015,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", var docDef = new DocumentDefinition(dto.NodeId, versionId, content.UpdateDate, content.CreateDate, contentType); - var properties = GetPropertyCollection(docSql, new[] { docDef }); + var properties = GetPropertyCollection(docSql, new[] { docDef }, false); content.Properties = properties[dto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 8cfb037c6c..8bcfc3558b 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -146,7 +146,7 @@ namespace Umbraco.Core.Persistence.Repositories return ProcessQuery(sql, true); } - private IEnumerable ProcessQuery(Sql sql, bool withCache = false) + private IEnumerable ProcessQuery(Sql sql, bool withCache = false, bool isPaged = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sql); @@ -200,7 +200,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sql, defs); + var propertyData = GetPropertyCollection(sql, defs, isPaged); // assign var dtoIndex = 0; @@ -507,7 +507,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsContentVersion", "contentId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, isPaged:true), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -515,7 +515,7 @@ namespace Umbraco.Core.Persistence.Repositories /// /// Private method to create a media object from a ContentDto /// - /// + /// /// /// /// @@ -527,7 +527,7 @@ namespace Umbraco.Core.Persistence.Repositories var docDef = new DocumentDefinition(dto.NodeId, versionId, media.UpdateDate, media.CreateDate, contentType); - var properties = GetPropertyCollection(docSql, new[] { docDef }); + var properties = GetPropertyCollection(docSql, new[] { docDef }, false); media.Properties = properties[dto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 8b3bf4a471..f83fdcef51 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -449,7 +449,7 @@ namespace Umbraco.Core.Persistence.Repositories var factory = new MemberFactory(memberType, NodeObjectTypeId, dto.NodeId); var media = factory.BuildEntity(dto); - var properties = GetPropertyCollection(sql, new[] { new DocumentDefinition(dto.NodeId, dto.ContentVersionDto.VersionId, media.UpdateDate, media.CreateDate, memberType) }); + var properties = GetPropertyCollection(sql, new[] { new DocumentDefinition(dto.NodeId, dto.ContentVersionDto.VersionId, media.UpdateDate, media.CreateDate, memberType) }, false); media.Properties = properties[dto.NodeId]; @@ -624,7 +624,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsMember", "nodeId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, isPaged:true), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -664,7 +664,7 @@ namespace Umbraco.Core.Persistence.Repositories return base.GetEntityPropertyNameForOrderBy(orderBy); } - private IEnumerable ProcessQuery(Sql sql, bool withCache = false) + private IEnumerable ProcessQuery(Sql sql, bool withCache = false, bool isPaged = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sql); @@ -704,7 +704,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sql, defs); + var propertyData = GetPropertyCollection(sql, defs, isPaged); // assign var dtoIndex = 0; @@ -741,7 +741,7 @@ namespace Umbraco.Core.Persistence.Repositories var docDef = new DocumentDefinition(dto.ContentVersionDto.NodeId, versionId, member.UpdateDate, member.CreateDate, memberType); - var properties = GetPropertyCollection(docSql, new[] { docDef }); + var properties = GetPropertyCollection(docSql, new[] { docDef }, false); member.Properties = properties[dto.ContentVersionDto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 31fc4a3f68..26c53a091f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs @@ -465,7 +465,7 @@ namespace Umbraco.Core.Persistence.Repositories // the pageResult, then the GetAll will actually return ALL records in the db. if (pagedResult.Items.Any()) { - //Crete the inner paged query that was used above to get the paged result, we'll use that as the inner sub query + //Create the inner paged query that was used above to get the paged result, we'll use that as the inner sub query var args = sqlNodeIdsWithSort.Arguments; string sqlStringCount, sqlStringPage; Database.BuildPageQueries(pageIndex * pageSize, pageSize, sqlNodeIdsWithSort.SQL, ref args, out sqlStringCount, out sqlStringPage); @@ -486,7 +486,10 @@ namespace Umbraco.Core.Persistence.Repositories GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, defaultFilter), orderDirection, orderBy, orderBySystemField, nodeIdSelect); - return processQuery(fullQuery, sqlNodeIdsWithSort); + //get the id query in the paged format + var idPagedQuery = new Sql(sqlStringPage, args); + + return processQuery(fullQuery, idPagedQuery); } else { @@ -498,15 +501,17 @@ namespace Umbraco.Core.Persistence.Repositories protected IDictionary GetPropertyCollection( Sql docSql, - IReadOnlyCollection documentDefs) + IReadOnlyCollection documentDefs, + bool isPaged) { if (documentDefs.Count == 0) return new Dictionary(); //we need to parse the original SQL statement and reduce the columns to just cmsContent.nodeId, cmsContentVersion.VersionId so that we can use // the statement to go get the property data for all of the items by using an inner join var parsedOriginalSql = "SELECT {0} " + docSql.SQL.Substring(docSql.SQL.IndexOf("FROM", StringComparison.Ordinal)); - //now remove everything from an Orderby clause and beyond - if (parsedOriginalSql.InvariantContains("ORDER BY ")) + + //now remove everything from an Orderby clause and beyond if this is unpaged data + if (isPaged == false && parsedOriginalSql.InvariantContains("ORDER BY ")) { parsedOriginalSql = parsedOriginalSql.Substring(0, parsedOriginalSql.LastIndexOf("ORDER BY ", StringComparison.Ordinal)); } @@ -524,7 +529,7 @@ WHERE EXISTS( INNER JOIN cmsPropertyType ON b.datatypeNodeId = cmsPropertyType.dataTypeId INNER JOIN - (" + string.Format(parsedOriginalSql, "DISTINCT cmsContent.contentType") + @") as docData + (" + string.Format(parsedOriginalSql, "cmsContent.contentType") + @") as docData ON cmsPropertyType.contentTypeId = docData.contentType WHERE a.id = b.id)", docSql.Arguments); From 2f67a485aaa2712932af5bba321c93f7508a27dd Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 31 Jan 2017 14:52:48 +1100 Subject: [PATCH 05/58] Ensures that the sqlIds query is used for paging when processing members/media --- .../Repositories/MediaRepository.cs | 29 +++++++++++----- .../Repositories/MemberRepository.cs | 33 +++++++++++++------ 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 8bcfc3558b..c4957ca9fe 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence.Repositories sql.Where("umbracoNode.id in (@ids)", new { ids = ids }); } - return ProcessQuery(sql); + return ProcessQuery(sql, sql); } protected override IEnumerable PerformGetByQuery(IQuery query) @@ -78,7 +78,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = translator.Translate() .OrderBy(x => x.SortOrder, SqlSyntax); - return ProcessQuery(sql); + return ProcessQuery(sql, sql); } #endregion @@ -143,13 +143,25 @@ namespace Umbraco.Core.Persistence.Repositories var sql = GetBaseQuery(false) .Where(GetBaseWhereClause(), new { Id = id }) .OrderByDescending(x => x.VersionDate, SqlSyntax); - return ProcessQuery(sql, true); + return ProcessQuery(sql, sql, true); } - private IEnumerable ProcessQuery(Sql sql, bool withCache = false, bool isPaged = false) + /// + /// This is the underlying method that processes most queries for this repository + /// + /// + /// The full SQL to select all media data + /// + /// + /// The Id SQL to just return all media ids - used to process the properties for the media item + /// + /// True if this is a paged query + /// + /// + private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) { // fetch returns a list so it's ok to iterate it in this method - var dtos = Database.Fetch(sql); + var dtos = Database.Fetch(sqlFull); var content = new IMedia[dtos.Count]; var defs = new List(); @@ -200,7 +212,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sql, defs, isPaged); + var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); // assign var dtoIndex = 0; @@ -257,7 +269,8 @@ namespace Umbraco.Core.Persistence.Repositories query = query .Where(x => x.NodeId > baseId, SqlSyntax) .OrderBy(x => x.NodeId, SqlSyntax); - var xmlItems = ProcessQuery(SqlSyntax.SelectTop(query, groupSize)) + var sql = SqlSyntax.SelectTop(query, groupSize); + var xmlItems = ProcessQuery(sql, sql) .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() }) .ToList(); @@ -507,7 +520,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsContentVersion", "contentId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, isPaged:true), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged: true), orderBy, orderDirection, orderBySystemField, filterCallback); } diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index f83fdcef51..0cb5be4ce0 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence.Repositories sql.Where("umbracoNode.id in (@ids)", new { ids = ids }); } - return ProcessQuery(sql); + return ProcessQuery(sql, sql); } @@ -90,7 +90,7 @@ namespace Umbraco.Core.Persistence.Repositories baseQuery.Append(new Sql("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments)) .OrderBy(x => x.SortOrder); - return ProcessQuery(baseQuery); + return ProcessQuery(baseQuery, baseQuery); } else { @@ -98,7 +98,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = translator.Translate() .OrderBy(x => x.SortOrder); - return ProcessQuery(sql); + return ProcessQuery(sql, sql); } } @@ -385,7 +385,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = GetBaseQuery(false) .Where(GetBaseWhereClause(), new { Id = id }) .OrderByDescending(x => x.VersionDate, SqlSyntax); - return ProcessQuery(sql, true); + return ProcessQuery(sql, sql, true); } public void RebuildXmlStructures(Func serializer, int groupSize = 200, IEnumerable contentTypeIds = null) @@ -408,7 +408,8 @@ namespace Umbraco.Core.Persistence.Repositories query = query .Where(x => x.NodeId > baseId) .OrderBy(x => x.NodeId, SqlSyntax); - var xmlItems = ProcessQuery(SqlSyntax.SelectTop(query, groupSize)) + var sql = SqlSyntax.SelectTop(query, groupSize); + var xmlItems = ProcessQuery(sql, sql) .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() }) .ToList(); @@ -540,7 +541,7 @@ namespace Umbraco.Core.Persistence.Repositories .OrderByDescending(x => x.VersionDate) .OrderBy(x => x.SortOrder); - return ProcessQuery(sql); + return ProcessQuery(sql, sql); } @@ -624,7 +625,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsMember", "nodeId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, isPaged:true), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged:true), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -664,10 +665,22 @@ namespace Umbraco.Core.Persistence.Repositories return base.GetEntityPropertyNameForOrderBy(orderBy); } - private IEnumerable ProcessQuery(Sql sql, bool withCache = false, bool isPaged = false) + /// + /// This is the underlying method that processes most queries for this repository + /// + /// + /// The full SQL to select all member data + /// + /// + /// The Id SQL to just return all member ids - used to process the properties for the member item + /// + /// True if this is a paged query + /// + /// + private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) { // fetch returns a list so it's ok to iterate it in this method - var dtos = Database.Fetch(sql); + var dtos = Database.Fetch(sqlFull); var content = new IMember[dtos.Count]; var defs = new List(); @@ -704,7 +717,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sql, defs, isPaged); + var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); // assign var dtoIndex = 0; From 86b2dac231e771c1e0639ae2d2d9fff0d7121c35 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 31 Jan 2017 17:20:44 +1100 Subject: [PATCH 06/58] Needed to change the 2nd query to use a new PagingSqlQuery object due to the way that < SQL 2012 formats it's paging query which is just not compatible with how we were parsing the queries for properties... i don't actually think it was working for a long tme. --- .../Repositories/ContentRepository.cs | 21 ++- .../Repositories/MediaRepository.cs | 19 +-- .../Repositories/MemberRepository.cs | 25 ++- .../Repositories/VersionableRepositoryBase.cs | 159 ++++++++++++++---- 4 files changed, 156 insertions(+), 68 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index f7b88ef46b..aedf701524 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -84,7 +84,7 @@ namespace Umbraco.Core.Persistence.Repositories var sqlBaseFull = GetBaseQuery(BaseQueryType.Full); var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids); - return ProcessQuery(translate(sqlBaseFull), translate(sqlBaseIds)); + return ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds))); } protected override IEnumerable PerformGetByQuery(IQuery query) @@ -103,7 +103,7 @@ namespace Umbraco.Core.Persistence.Repositories var translatorFull = new SqlTranslator(sqlBaseFull, query); var translatorIds = new SqlTranslator(sqlBaseIds, query); - return ProcessQuery(translate(translatorFull), translate(translatorIds)); + return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds))); } #endregion @@ -225,7 +225,7 @@ namespace Umbraco.Core.Persistence.Repositories var sqlFull = translate(baseId, GetBaseQuery(BaseQueryType.Full)); var sqlIds = translate(baseId, GetBaseQuery(BaseQueryType.Ids)); - var xmlItems = ProcessQuery(SqlSyntax.SelectTop(sqlFull, groupSize), SqlSyntax.SelectTop(sqlIds, groupSize)) + var xmlItems = ProcessQuery(SqlSyntax.SelectTop(sqlFull, groupSize), new PagingSqlQuery(SqlSyntax.SelectTop(sqlIds, groupSize))) .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() }) .ToList(); @@ -260,7 +260,7 @@ namespace Umbraco.Core.Persistence.Repositories var sqlFull = translate(GetBaseQuery(BaseQueryType.Full)); var sqlIds = translate(GetBaseQuery(BaseQueryType.Ids)); - return ProcessQuery(sqlFull, sqlIds, true); + return ProcessQuery(sqlFull, new PagingSqlQuery(sqlIds), true); } public override IContent GetByVersion(Guid versionId) @@ -679,7 +679,7 @@ namespace Umbraco.Core.Persistence.Repositories var sqlIds = GetBaseQuery(BaseQueryType.Ids); var translatorIds = new SqlTranslator(sqlIds, query); - return ProcessQuery(translate(translatorFull), translate(translatorIds), true); + return ProcessQuery(translate(translatorFull), new PagingSqlQuery(translate(translatorIds)), true); } /// @@ -859,7 +859,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsDocument", "nodeId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged:true), orderBy, orderDirection, orderBySystemField, + (sqlFull, pagingSqlQuery) => ProcessQuery(sqlFull, pagingSqlQuery), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -896,13 +896,12 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", /// /// The full SQL with the outer join to return all data required to create an IContent /// - /// + /// /// The Id SQL without the outer join to just return all document ids - used to process the properties for the content item /// - /// True if this is a paged query /// /// - private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) + private IEnumerable ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sqlFull); @@ -968,7 +967,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", .ToDictionary(x => x.Id, x => x); // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); + var propertyData = GetPropertyCollection(pagingSqlQuery, defs); // assign var dtoIndex = 0; @@ -1015,7 +1014,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", var docDef = new DocumentDefinition(dto.NodeId, versionId, content.UpdateDate, content.CreateDate, contentType); - var properties = GetPropertyCollection(docSql, new[] { docDef }, false); + var properties = GetPropertyCollection(docSql, new[] { docDef }); content.Properties = properties[dto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index c4957ca9fe..56b5e2ed9d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence.Repositories sql.Where("umbracoNode.id in (@ids)", new { ids = ids }); } - return ProcessQuery(sql, sql); + return ProcessQuery(sql, new PagingSqlQuery(sql)); } protected override IEnumerable PerformGetByQuery(IQuery query) @@ -78,7 +78,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = translator.Translate() .OrderBy(x => x.SortOrder, SqlSyntax); - return ProcessQuery(sql, sql); + return ProcessQuery(sql, new PagingSqlQuery(sql)); } #endregion @@ -143,7 +143,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = GetBaseQuery(false) .Where(GetBaseWhereClause(), new { Id = id }) .OrderByDescending(x => x.VersionDate, SqlSyntax); - return ProcessQuery(sql, sql, true); + return ProcessQuery(sql, new PagingSqlQuery(sql), true); } /// @@ -152,13 +152,12 @@ namespace Umbraco.Core.Persistence.Repositories /// /// The full SQL to select all media data /// - /// + /// /// The Id SQL to just return all media ids - used to process the properties for the media item /// - /// True if this is a paged query /// /// - private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) + private IEnumerable ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sqlFull); @@ -212,7 +211,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); + var propertyData = GetPropertyCollection(pagingSqlQuery, defs); // assign var dtoIndex = 0; @@ -270,7 +269,7 @@ namespace Umbraco.Core.Persistence.Repositories .Where(x => x.NodeId > baseId, SqlSyntax) .OrderBy(x => x.NodeId, SqlSyntax); var sql = SqlSyntax.SelectTop(query, groupSize); - var xmlItems = ProcessQuery(sql, sql) + var xmlItems = ProcessQuery(sql, new PagingSqlQuery(sql)) .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() }) .ToList(); @@ -520,7 +519,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsContentVersion", "contentId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged: true), orderBy, orderDirection, orderBySystemField, + (sqlFull, pagingSqlQuery) => ProcessQuery(sqlFull, pagingSqlQuery), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -540,7 +539,7 @@ namespace Umbraco.Core.Persistence.Repositories var docDef = new DocumentDefinition(dto.NodeId, versionId, media.UpdateDate, media.CreateDate, contentType); - var properties = GetPropertyCollection(docSql, new[] { docDef }, false); + var properties = GetPropertyCollection(new PagingSqlQuery(docSql), new[] { docDef }); media.Properties = properties[dto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 0cb5be4ce0..9fdee650b3 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence.Repositories sql.Where("umbracoNode.id in (@ids)", new { ids = ids }); } - return ProcessQuery(sql, sql); + return ProcessQuery(sql, new PagingSqlQuery(sql)); } @@ -90,7 +90,7 @@ namespace Umbraco.Core.Persistence.Repositories baseQuery.Append(new Sql("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments)) .OrderBy(x => x.SortOrder); - return ProcessQuery(baseQuery, baseQuery); + return ProcessQuery(baseQuery, new PagingSqlQuery(baseQuery)); } else { @@ -98,7 +98,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = translator.Translate() .OrderBy(x => x.SortOrder); - return ProcessQuery(sql, sql); + return ProcessQuery(sql, new PagingSqlQuery(sql)); } } @@ -385,7 +385,7 @@ namespace Umbraco.Core.Persistence.Repositories var sql = GetBaseQuery(false) .Where(GetBaseWhereClause(), new { Id = id }) .OrderByDescending(x => x.VersionDate, SqlSyntax); - return ProcessQuery(sql, sql, true); + return ProcessQuery(sql, new PagingSqlQuery(sql), true); } public void RebuildXmlStructures(Func serializer, int groupSize = 200, IEnumerable contentTypeIds = null) @@ -409,7 +409,7 @@ namespace Umbraco.Core.Persistence.Repositories .Where(x => x.NodeId > baseId) .OrderBy(x => x.NodeId, SqlSyntax); var sql = SqlSyntax.SelectTop(query, groupSize); - var xmlItems = ProcessQuery(sql, sql) + var xmlItems = ProcessQuery(sql, new PagingSqlQuery(sql)) .Select(x => new ContentXmlDto { NodeId = x.Id, Xml = serializer(x).ToString() }) .ToList(); @@ -450,7 +450,7 @@ namespace Umbraco.Core.Persistence.Repositories var factory = new MemberFactory(memberType, NodeObjectTypeId, dto.NodeId); var media = factory.BuildEntity(dto); - var properties = GetPropertyCollection(sql, new[] { new DocumentDefinition(dto.NodeId, dto.ContentVersionDto.VersionId, media.UpdateDate, media.CreateDate, memberType) }, false); + var properties = GetPropertyCollection(new PagingSqlQuery(sql), new[] { new DocumentDefinition(dto.NodeId, dto.ContentVersionDto.VersionId, media.UpdateDate, media.CreateDate, memberType) }); media.Properties = properties[dto.NodeId]; @@ -541,7 +541,7 @@ namespace Umbraco.Core.Persistence.Repositories .OrderByDescending(x => x.VersionDate) .OrderBy(x => x.SortOrder); - return ProcessQuery(sql, sql); + return ProcessQuery(sql, new PagingSqlQuery(sql)); } @@ -625,7 +625,7 @@ namespace Umbraco.Core.Persistence.Repositories return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, new Tuple("cmsMember", "nodeId"), - (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds, isPaged:true), orderBy, orderDirection, orderBySystemField, + (sqlFull, sqlIds) => ProcessQuery(sqlFull, sqlIds), orderBy, orderDirection, orderBySystemField, filterCallback); } @@ -671,13 +671,12 @@ namespace Umbraco.Core.Persistence.Repositories /// /// The full SQL to select all member data /// - /// + /// /// The Id SQL to just return all member ids - used to process the properties for the member item /// - /// True if this is a paged query /// /// - private IEnumerable ProcessQuery(Sql sqlFull, Sql sqlIds, bool withCache = false, bool isPaged = false) + private IEnumerable ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false) { // fetch returns a list so it's ok to iterate it in this method var dtos = Database.Fetch(sqlFull); @@ -717,7 +716,7 @@ namespace Umbraco.Core.Persistence.Repositories } // load all properties for all documents from database in 1 query - var propertyData = GetPropertyCollection(sqlIds, defs, isPaged); + var propertyData = GetPropertyCollection(pagingSqlQuery, defs); // assign var dtoIndex = 0; @@ -754,7 +753,7 @@ namespace Umbraco.Core.Persistence.Repositories var docDef = new DocumentDefinition(dto.ContentVersionDto.NodeId, versionId, member.UpdateDate, member.CreateDate, memberType); - var properties = GetPropertyCollection(docSql, new[] { docDef }, false); + var properties = GetPropertyCollection(docSql, new[] { docDef }); member.Properties = properties[dto.ContentVersionDto.NodeId]; diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 26c53a091f..6b18fc70b4 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs @@ -431,7 +431,7 @@ namespace Umbraco.Core.Persistence.Repositories /// orderBy protected IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, Tuple nodeIdSelect, - Func> processQuery, + Func, IEnumerable> processQuery, string orderBy, Direction orderDirection, bool orderBySystemField, @@ -485,11 +485,8 @@ namespace Umbraco.Core.Persistence.Repositories var fullQuery = GetSortedSqlForPagedResults( GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, defaultFilter), orderDirection, orderBy, orderBySystemField, nodeIdSelect); - - //get the id query in the paged format - var idPagedQuery = new Sql(sqlStringPage, args); - - return processQuery(fullQuery, idPagedQuery); + + return processQuery(fullQuery, new PagingSqlQuery(Database, sqlNodeIdsWithSort, pageIndex, pageSize)); } else { @@ -499,20 +496,47 @@ namespace Umbraco.Core.Persistence.Repositories return result; } + /// + /// Gets the property collection for a non-paged query + /// + /// + /// + /// protected IDictionary GetPropertyCollection( - Sql docSql, - IReadOnlyCollection documentDefs, - bool isPaged) + Sql sql, + IReadOnlyCollection documentDefs) + { + return GetPropertyCollection(new PagingSqlQuery(sql), documentDefs); + } + + /// + /// Gets the property collection for a query + /// + /// + /// + /// + protected IDictionary GetPropertyCollection( + PagingSqlQuery pagingSqlQuery, + IReadOnlyCollection documentDefs) { if (documentDefs.Count == 0) return new Dictionary(); + //initialize to the query passed in + var docSql = pagingSqlQuery.PrePagedSql; + //we need to parse the original SQL statement and reduce the columns to just cmsContent.nodeId, cmsContentVersion.VersionId so that we can use // the statement to go get the property data for all of the items by using an inner join var parsedOriginalSql = "SELECT {0} " + docSql.SQL.Substring(docSql.SQL.IndexOf("FROM", StringComparison.Ordinal)); - - //now remove everything from an Orderby clause and beyond if this is unpaged data - if (isPaged == false && parsedOriginalSql.InvariantContains("ORDER BY ")) + + if (pagingSqlQuery.HasPaging) { + //if this is a paged query, build the paged query with the custom column substitution, then re-assign + docSql = pagingSqlQuery.BuildPagedQuery("{0}"); + parsedOriginalSql = docSql.SQL; + } + else if (parsedOriginalSql.InvariantContains("ORDER BY ")) + { + //now remove everything from an Orderby clause and beyond if this is unpaged data parsedOriginalSql = parsedOriginalSql.Substring(0, parsedOriginalSql.LastIndexOf("ORDER BY ", StringComparison.Ordinal)); } @@ -652,28 +676,7 @@ ORDER BY contentNodeId, propertytypeid return result; } - - public class DocumentDefinition - { - /// - /// Initializes a new instance of the class. - /// - public DocumentDefinition(int id, Guid version, DateTime versionDate, DateTime createDate, IContentTypeComposition composition) - { - Id = id; - Version = version; - VersionDate = versionDate; - CreateDate = createDate; - Composition = composition; - } - - public int Id { get; set; } - public Guid Version { get; set; } - public DateTime VersionDate { get; set; } - public DateTime CreateDate { get; set; } - public IContentTypeComposition Composition { get; set; } - } - + protected virtual string GetDatabaseFieldNameForOrderBy(string orderBy) { // Translate the passed order by field (which were originally defined for in-memory object sorting @@ -769,5 +772,93 @@ ORDER BY contentNodeId, propertytypeid /// /// protected abstract Sql GetBaseQuery(BaseQueryType queryType); + + + internal class DocumentDefinition + { + /// + /// Initializes a new instance of the class. + /// + public DocumentDefinition(int id, Guid version, DateTime versionDate, DateTime createDate, IContentTypeComposition composition) + { + Id = id; + Version = version; + VersionDate = versionDate; + CreateDate = createDate; + Composition = composition; + } + + public int Id { get; set; } + public Guid Version { get; set; } + public DateTime VersionDate { get; set; } + public DateTime CreateDate { get; set; } + public IContentTypeComposition Composition { get; set; } + } + + /// + /// An object representing a query that may contain paging information + /// + internal class PagingSqlQuery + { + public Sql PrePagedSql { get; private set; } + + public PagingSqlQuery(Sql prePagedSql) + { + PrePagedSql = prePagedSql; + } + + public virtual bool HasPaging + { + get { return false; } + } + + public virtual Sql BuildPagedQuery(string selectColumns) + { + throw new InvalidOperationException("This query has no paging information"); + } + } + + /// + /// An object representing a query that contains paging information + /// + /// + internal class PagingSqlQuery : PagingSqlQuery + { + private readonly Database _db; + private readonly long _pageIndex; + private readonly int _pageSize; + + public PagingSqlQuery(Database db, Sql prePagedSql, long pageIndex, int pageSize) : base(prePagedSql) + { + _db = db; + _pageIndex = pageIndex; + _pageSize = pageSize; + } + + public override bool HasPaging + { + get { return _pageSize > 0; } + } + + /// + /// Creates a paged query based on the original query and subtitutes the selectColumns specified + /// + /// + /// + public override Sql BuildPagedQuery(string selectColumns) + { + if (HasPaging == false) throw new InvalidOperationException("This query has no paging information"); + + var resultSql = string.Format("SELECT {0} {1}", selectColumns, PrePagedSql.SQL.Substring(PrePagedSql.SQL.IndexOf("FROM", StringComparison.Ordinal))); + + //this query is meant to be paged so we need to generate the paging syntax + //Create the inner paged query that was used above to get the paged result, we'll use that as the inner sub query + var args = PrePagedSql.Arguments; + string sqlStringCount, sqlStringPage; + _db.BuildPageQueries(_pageIndex * _pageSize, _pageSize, resultSql, ref args, out sqlStringCount, out sqlStringPage); + + return new Sql(sqlStringPage, args); + } + } } } \ No newline at end of file From 77b04d74d4dd8c4b464984480bd0cb16c64a51e2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 Jan 2017 10:00:44 +0100 Subject: [PATCH 07/58] load mini list view for pickers with a start node --- src/Umbraco.Web.UI.Client/src/less/belle.less | 1 + .../src/less/components/umb-pagination.less | 3 ++ .../treepicker/treepicker.controller.js | 28 +++++++++++----- .../overlays/treepicker/treepicker.html | 32 +++++++++---------- .../src/views/components/umb-pagination.html | 2 +- 5 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 6fbf12e815..c6c63f1057 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -118,6 +118,7 @@ @import "components/umb-avatar.less"; @import "components/umb-progress-bar.less"; @import "components/umb-querybuilder.less"; +@import "components/umb-pagination.less"; @import "components/buttons/umb-button.less"; @import "components/buttons/umb-button-group.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less new file mode 100644 index 0000000000..8d3d563cab --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less @@ -0,0 +1,3 @@ +.umb-pagination ul { + box-shadow: none; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index a1ee1f031f..8127cd8de6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -38,11 +38,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } } } - - // Search is only working for content, media and member section so we will remove it from everything else - if($scope.section === "content" || $scope.section === "media" || $scope.section === "member" ) { - $scope.enableSearh = true; - } //create the custom query string param for this tree $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : ""; @@ -72,6 +67,21 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", entityType = "Media"; } + // Search and listviews is only working for content, media and member section so we will remove it from everything else + if ($scope.section === "content" || $scope.section === "media" || $scope.section === "member") { + $scope.enableSearh = true; + + //if a alternative startnode is used, we need to check if it is a container + if (dialogOptions.startNodeId) { + + entityResource.getById(dialogOptions.startNodeId, entityType).then(function (node) { + if (node.metaData.IsContainer) { + openMiniListView(node); + } + }); + } + } + //Configures filtering if (dialogOptions.filter) { @@ -588,11 +598,13 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", var promise = ""; - if(node.nodeType === "content") { + console.log(entityType); + + if (entityType === "Document") { promise = contentResource.getChildren(node.id, $scope.pagination); - } else if( node.nodeType === "member") { + } else if (entityType === "Member") { promise = memberResource.getPagedResults(node.id, $scope.pagination); - } else if(node.nodeType === "media") { + } else if (entityType === "Media") { promise = mediaResource.getChildren(node.id, $scope.pagination); } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index a37a63bb0f..e2a0554b47 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -38,33 +38,31 @@
-
-
- - Back - -

- - {{ miniListView.node.name }} -

+
+ +
+ Back
+ +
+ +

{{ miniListView.node.name }}

+
+
- +
-
- -
- Name -
-
-
+ +
+
+ -
+
+ + +
+ +
{{ child.name }}
- -
+ +
From 7c42cd26c2693d9a2b6f5ed04a0e29c2011232fc Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 31 Jan 2017 10:26:03 +0100 Subject: [PATCH 09/58] clear minilistview data when leaving --- .../views/common/overlays/treepicker/treepicker.controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 8127cd8de6..a6f387b0be 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -567,6 +567,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.exitMiniListView = function() { console.log($scope.miniListView); $scope.showMiniListView = false; + $scope.miniListView = {}; }; $scope.searchMiniListView = function() { From 26acecb7200fcc64ddee25782e72615900f9046e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Feb 2017 00:28:40 +0100 Subject: [PATCH 10/58] start on animation and nested list views --- .../components/tree/umbtreeitem.directive.js | 4 +- .../components/umbpagination.directive.js | 48 ++++-- .../src/less/components/umb-table.less | 56 +++++++ .../treepicker/treepicker.controller.js | 152 +++++++++++------- .../overlays/treepicker/treepicker.html | 133 +++++++-------- 5 files changed, 256 insertions(+), 137 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js index e519bb78b0..8d30e071a6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js @@ -38,7 +38,7 @@ angular.module("umbraco.directives") '
' + //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog //'' + - ' ' + + ' ' + '' + '' + //NOTE: These are the 'option' elipses @@ -195,7 +195,7 @@ angular.module("umbraco.directives") emits treeNodeCollapsing event if already expanded and treeNodeExpanding if collapsed */ scope.load = function (node) { - if (node.expanded) { + if (node.expanded && !node.metaData.isContainer) { deleteAnimations = false; emitEvent("treeNodeCollapsing", { tree: scope.tree, node: node, element: element }); node.expanded = false; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js index fe753171e1..610f8546a3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js @@ -134,25 +134,40 @@ Use this directive to generate a pagination. } - scope.next = function() { - if (scope.onNext && scope.pageNumber < scope.totalPages) { - scope.pageNumber++; - scope.onNext(scope.pageNumber); - } + scope.next = function () { + if (scope.pageNumber < scope.totalPages) { + scope.pageNumber++; + if (scope.onNext) { + scope.onNext(scope.pageNumber); + } + if (scope.onChange) { + scope.onChange({ "pageNumber": scope.pageNumber }); + } + } }; - scope.prev = function(pageNumber) { - if (scope.onPrev && scope.pageNumber > 1) { - scope.pageNumber--; - scope.onPrev(scope.pageNumber); - } + scope.prev = function (pageNumber) { + if (scope.pageNumber > 1) { + scope.pageNumber--; + if (scope.onPrev) { + scope.onPrev(scope.pageNumber); + } + if (scope.onChange) { + scope.onChange({ "pageNumber": scope.pageNumber }); + } + } }; - scope.goToPage = function(pageNumber) { - if(scope.onGoToPage) { - scope.pageNumber = pageNumber + 1; - scope.onGoToPage(scope.pageNumber); - } + scope.goToPage = function (pageNumber) { + scope.pageNumber = pageNumber + 1; + if (scope.onGoToPage) { + scope.onGoToPage(scope.pageNumber); + } + if (scope.onChange) { + if (scope.onChange) { + scope.onChange({ "pageNumber": scope.pageNumber }); + } + } }; var unbindPageNumberWatcher = scope.$watch('pageNumber', function(newValue, oldValue){ @@ -176,7 +191,8 @@ Use this directive to generate a pagination. totalPages: "=", onNext: "=", onPrev: "=", - onGoToPage: "=" + onGoToPage: "=", + onChange: "&" }, link: link }; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 7f4afc3de7..e48fbf1958 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -269,3 +269,59 @@ input.umb-table__input { } } + + +/* Forward */ +.animate-enter, +.animate-leave +{ + transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + position: relative; + display: block; +} + +.animate-enter { + left: 100%; +} + +.animate-enter.animate-enter-active { + left: 0; + opacity: 1; +} + +.animate-leave { + left: 0; +} + +.animate-leave.animate-leave-active{ + left: -100%; + opacity: 0; +} + +/* Backwards */ + +.animate-reverse-enter, +.animate-reverse-leave +{ + transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + position: relative; + display: block; +} + +.animate-reverse-enter { + right: 100%; +} + +.animate-reverse-enter.animate-reverse-enter-active { + right: 0; + opacity: 1; +} + +.animate-reverse-leave { + left: 0; +} + +.animate-reverse-leave.animate-reverse-leave-active{ + right: -100%; + opacity: 0; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index a6f387b0be..b0f66eea8f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -543,19 +543,28 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", /* Mini List View */ $scope.miniListView = {}; - $scope.nextPage = function(pageNumber) { - $scope.pagination.pageNumber = pageNumber; - getPagedChildren($scope.miniListView.node); - }; + $scope.goToPage = function(pageNumber, miniListView) { - $scope.prevPage = function(pageNumber) { - $scope.pagination.pageNumber = pageNumber; - getPagedChildren($scope.miniListView.node); - }; + // set new page number + miniListView.pagination.pageNumber = pageNumber; - $scope.goToPage = function(pageNumber) { - $scope.pagination.pageNumber = pageNumber; - getPagedChildren($scope.miniListView.node); + // start loading animation list view + miniListView.loading = true; + + resource(miniListView.node.id, miniListView.pagination) + .then(function (data) { + + // update children + miniListView.children = data.items; + + // update pagination + miniListView.pagination.totalItems = data.totalItems; + miniListView.pagination.totalPages = data.totalPages; + + // stop load indicator + miniListView.loading = false; + + }); }; $scope.selectListViewItem = function(item) { @@ -564,66 +573,101 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", item.selected = item.selected === true ? false : true; }; - $scope.exitMiniListView = function() { - console.log($scope.miniListView); - $scope.showMiniListView = false; - $scope.miniListView = {}; + $scope.exitMiniListView = function(node) { + + goingForward = false; + + if(miniListViewsHistory.length > 1) { + var prevMiniListViewIndex = miniListViewsHistory.length - 2; + var prevMiniListView = miniListViewsHistory[prevMiniListViewIndex]; + $scope.miniListViews = []; + $scope.miniListViews.push(prevMiniListView); + miniListViewsHistory.splice(-1,1); + } else { + miniListViewsHistory = []; + $scope.miniListViews = []; + } + }; $scope.searchMiniListView = function() { searchMiniListView(); }; + $scope.test = function(node) { + openMiniListView(node); + }; + + $scope.miniListViews = []; + + var miniListViewsHistory = []; + var resource = ""; + var goingForward = true; + + if (entityType === "Document") { + resource = contentResource.getChildren; + } else if (entityType === "Member") { + resource = memberResource.getPagedResults; + } else if (entityType === "Media") { + resource = mediaResource.getChildren; + } + function openMiniListView(node) { - $scope.showMiniListView = true; + goingForward = true; - $scope.pagination = { - pageSize: 10, - pageNumber: 1, - filter: '', - orderDirection: "Ascending", - orderBy: "SortOrder", - orderBySystemField: true + var miniListView = { + node: node, + loading: true, + pagination: { + pageSize: 10, + pageNumber: 1, + filter: '', + orderDirection: "Ascending", + orderBy: "SortOrder", + orderBySystemField: true + } }; + + // start loading animation on node + node.loading = true; - getPagedChildren(node); + resource(node.id, miniListView.pagination) + .then(function (data) { + + console.log("data data data", data); + + // update children + miniListView.children = data.items; + + // update pagination + miniListView.pagination.totalItems = data.totalItems; + miniListView.pagination.totalPages = data.totalPages; + + // stop load indicator + miniListView.loading = false; + + // stop loading animation on node + node.loading = false; + + $scope.miniListViews = []; + $scope.miniListViews.push(miniListView); + miniListViewsHistory.push(miniListView); + + console.log("history", miniListViewsHistory); + + }); } - function getPagedChildren(node) { + $scope.animationTest = function() { - // start load indicator - $scope.miniListView.node = node; - $scope.miniListView.loading = true; - - var promise = ""; - - console.log(entityType); - - if (entityType === "Document") { - promise = contentResource.getChildren(node.id, $scope.pagination); - } else if (entityType === "Member") { - promise = memberResource.getPagedResults(node.id, $scope.pagination); - } else if (entityType === "Media") { - promise = mediaResource.getChildren(node.id, $scope.pagination); + if(goingForward) { + return 'animate'; + } else { + return 'animate-reverse'; } - promise - .then(function (data) { - - // update children - $scope.miniListView.children = data.items; - - // update pagination - $scope.pagination.totalItems = data.totalItems; - $scope.pagination.totalPages = data.totalPages; - - // stop load indicator - $scope.miniListView.loading = false; - - }); - } var searchMiniListView = _.debounce(function () { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index a4e8851b51..329f4fa6f8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -1,6 +1,6 @@
-
+
-
+
-
- Back +
+ +
+ Back +
+ +
+ +

{{ miniListView.node.name }}

+
+
-
- -

{{ miniListView.node.name }}

-
+
-
- -
- - -
-
- -
- -
- - -
- + +
+
+ +
+
+
+ + +
+
+
-
- -
+ +
- -
- -
- - -
-
- - + +
+ +
+ + +
+
+ + +
+
{{ child.name }}
+
LIST VIEW
+
+ + +
+
-
{{ child.name }}
-
- -
-
-
+
+ + +
-
- -
From d5a687cf3d5b28fb1ba7e90abe24c9251a5a2243 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 1 Feb 2017 23:12:49 +0100 Subject: [PATCH 11/58] start on code clean up - make ump-mini-list-view directive + move inline styles to classes --- .../components/umbminilistview.directive.js | 62 +++++++++++ src/Umbraco.Web.UI.Client/src/less/belle.less | 1 + .../less/components/umb-mini-list-view.less | 23 ++++ .../src/less/components/umb-table.less | 28 ++++- .../overlays/contentpicker/contentpicker.html | 58 +++++----- .../treepicker/treepicker.controller.js | 34 +++--- .../overlays/treepicker/treepicker.html | 100 ++++-------------- .../views/components/umb-mini-list-view.html | 68 ++++++++++++ 8 files changed, 247 insertions(+), 127 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js new file mode 100644 index 0000000000..9ddd2266dc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -0,0 +1,62 @@ +(function() { + 'use strict'; + + function MiniListViewDirective() { + + function link(scope, el, attr, ctrl) { + + scope.search = ""; + + scope.openChild = function(event, child) { + if(scope.onOpenChild) { + scope.onOpenChild({"child": child}); + event.stopPropagation(); + } + }; + + scope.selectChild = function(child) { + if(scope.onSelectChild) { + scope.onSelectChild({"child": child}); + } + }; + + scope.searchMiniListView = function() { + searchMiniListView(); + }; + + var searchMiniListView = _.debounce(function () { + + scope.$apply(function () { + if (scope.search !== null && scope.search !== undefined) { + if(scope.onSearch) { + scope.onSearch({"search": scope.search}); + } + } + }); + + }, 500); + + } + + var directive = { + restrict: 'E', + replace: true, + templateUrl: 'views/components/umb-mini-list-view.html', + scope: { + node: "=", + children: "=", + onSelectChild: "&", + onOpenChild: "&", + onSearch: "&", + loadingChildren: "=" + }, + link: link + }; + + return directive; + + } + + angular.module('umbraco.directives').directive('umbMiniListView', MiniListViewDirective); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index c6c63f1057..be55d136da 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -119,6 +119,7 @@ @import "components/umb-progress-bar.less"; @import "components/umb-querybuilder.less"; @import "components/umb-pagination.less"; +@import "components/umb-mini-list-view.less"; @import "components/buttons/umb-button.less"; @import "components/buttons/umb-button-group.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less new file mode 100644 index 0000000000..ebf4ef1290 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -0,0 +1,23 @@ +.umb-mini-list-view { + +} + +.umb-mini-list-view__title { + display: flex; + align-items: center; + margin-bottom: 10px; +} + +.umb-mini-list-view__title-text { + font-size: 16px; + font-weight: bold; +} + +.umb-mini-list-view__title-icon { + font-size: 20px; + margin-right: 5px; +} + +.umb-mini-list-view__back { + +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index e48fbf1958..878875ae3c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -10,7 +10,7 @@ flex-wrap: nowrap; justify-content: space-between; - min-width: 640px; + min-width: auto; } .umb-table.umb-table-inactive { @@ -103,11 +103,17 @@ input.umb-table__input { // Table Body Styles +.umb-table-body { + position: relative; +} + .umb-table-body .umb-table-row { color: fade(@gray, 75%); border-top: 1px solid @grayLight; cursor: pointer; font-size: 13px; + position: relative; + min-height: 32px; &:hover { background-color: fade(@grayLighter, 90%); @@ -250,6 +256,10 @@ input.umb-table__input { padding: 15px 0; } +.umb-table-cell--auto-width { + flex: 0 0 auto !important; +} + // Increases the space for the name cell .umb-table__name { @@ -257,8 +267,22 @@ input.umb-table__input { max-width: 25%; } -.umb-table--condensed { +.umb-table__loading-overlay { + position: absolute; + width: 100%; + height: 100%; + background-color: rgba(255, 255, 255, 0.7); + z-index: 1; +} +.umb-table__row-expand { + font-size: 12px; + text-decoration: none; + color: @black; +} + +.umb-table--condensed { + .umb-table-cell:first-of-type:not(.not-fixed) { padding-top: 10px; padding-bottom: 10px; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html index 8e70ad163c..c22b539b38 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html @@ -1,34 +1,34 @@
-
- - -
+
+ + +
- - + + -
- - -
+
+ + +
-
+
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index b0f66eea8f..6ad0665424 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -590,8 +590,25 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }; - $scope.searchMiniListView = function() { - searchMiniListView(); + $scope.searchMiniListView = function(search, miniListView) { + + miniListView.pagination.filter = search; + miniListView.loading = true; + + resource(miniListView.node.id, miniListView.pagination) + .then(function (data) { + + // update children + miniListView.children = data.items; + + // update pagination + miniListView.pagination.totalItems = data.totalItems; + miniListView.pagination.totalPages = data.totalPages; + + // stop load indicator + miniListView.loading = false; + + }); }; $scope.test = function(node) { @@ -661,24 +678,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } $scope.animationTest = function() { - if(goingForward) { return 'animate'; } else { return 'animate-reverse'; } - } - var searchMiniListView = _.debounce(function () { - - $scope.$apply(function () { - if ($scope.pagination.filter !== null && $scope.pagination.filter !== undefined) { - $scope.pagination.pageNumber = 1; - getPagedChildren($scope.miniListView.node, $scope.pagination); - } - }); - - }, 500); - }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index 329f4fa6f8..38e64965c1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -38,88 +38,26 @@
-
- -
- -
- Back -
- -
- -

{{ miniListView.node.name }}

-
- -
- -
- - -
-
- -
-
-
- - -
-
-
-
-
- - -
- - -
- -
- - -
-
- - -
-
{{ child.name }}
-
LIST VIEW
-
- - -
- -
- -
- -
- -
- - -
+
+ Back +
+ + + +
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html new file mode 100644 index 0000000000..185d446d67 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -0,0 +1,68 @@ +
+ +
+ +

{{ node.name }}

+
+ +
+ + +
+
+ +
+
+
+ + +
+
+
+
+
+ + +
+ + +
+ +
+ + +
+
+
+   + + +
+
+
{{ child.name }}
+
+ + +
+ +
+ +
+ +
+ +
\ No newline at end of file From 32d757b13ccfc5d0505efcde43d6db579a7112be Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 2 Feb 2017 17:05:33 +1100 Subject: [PATCH 12/58] Updates the ContentRepository to not fetch the published version info in the same query when returning a collection of documents, instead we fetch the published version information in a separate query --- .../Persistence/Factories/ContentFactory.cs | 22 +++- .../Persistence/Repositories/BaseQueryType.cs | 24 +++- .../Repositories/ContentRepository.cs | 107 +++++++++++++++--- .../Repositories/MediaRepository.cs | 2 +- .../Repositories/MemberRepository.cs | 2 +- .../Repositories/VersionableRepositoryBase.cs | 3 +- 6 files changed, 135 insertions(+), 25 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs index 88de5a1d6c..0532eab6b1 100644 --- a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs @@ -27,7 +27,20 @@ namespace Umbraco.Core.Persistence.Factories #region Implementation of IEntityFactory - public static IContent BuildEntity(DocumentDto dto, IContentType contentType) + /// + /// Builds a IContent item from the dto(s) and content type + /// + /// + /// This DTO can contain all of the information to build an IContent item, however in cases where multiple entities are being built, + /// a separate publishedDto entity will be supplied in place of the 's own + /// ResultColumn DocumentPublishedReadOnlyDto + /// + /// + /// + /// When querying for multiple content items the main DTO will not contain the ResultColumn DocumentPublishedReadOnlyDto and a separate publishedDto instance will be supplied + /// + /// + public static IContent BuildEntity(DocumentDto dto, IContentType contentType, DocumentPublishedReadOnlyDto publishedDto = null) { var content = new Content(dto.Text, dto.ContentVersionDto.ContentDto.NodeDto.ParentId, contentType); @@ -52,8 +65,13 @@ namespace Umbraco.Core.Persistence.Factories content.ExpireDate = dto.ExpiresDate.HasValue ? dto.ExpiresDate.Value : (DateTime?)null; content.ReleaseDate = dto.ReleaseDate.HasValue ? dto.ReleaseDate.Value : (DateTime?)null; content.Version = dto.ContentVersionDto.VersionId; + content.PublishedState = dto.Published ? PublishedState.Published : PublishedState.Unpublished; - content.PublishedVersionGuid = dto.DocumentPublishedReadOnlyDto == null ? default(Guid) : dto.DocumentPublishedReadOnlyDto.VersionId; + + //Check if the publishedDto has been supplied, if not the use the dto's own DocumentPublishedReadOnlyDto value + content.PublishedVersionGuid = publishedDto == null + ? (dto.DocumentPublishedReadOnlyDto == null ? default(Guid) : dto.DocumentPublishedReadOnlyDto.VersionId) + : publishedDto.VersionId; //on initial construction we don't want to have dirty properties tracked // http://issues.umbraco.org/issue/U4-1946 diff --git a/src/Umbraco.Core/Persistence/Repositories/BaseQueryType.cs b/src/Umbraco.Core/Persistence/Repositories/BaseQueryType.cs index 4579fd98fb..05061c47af 100644 --- a/src/Umbraco.Core/Persistence/Repositories/BaseQueryType.cs +++ b/src/Umbraco.Core/Persistence/Repositories/BaseQueryType.cs @@ -2,8 +2,30 @@ namespace Umbraco.Core.Persistence.Repositories { internal enum BaseQueryType { - Full, + /// + /// A query to return all information for a single item + /// + /// + /// In some cases this will be the same as + /// + FullSingle, + + /// + /// A query to return all information for multiple items + /// + /// + /// In some cases this will be the same as + /// + FullMultiple, + + /// + /// A query to return the ids for items + /// Ids, + + /// + /// A query to return the count for items + /// Count } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index aedf701524..ff466ea84e 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Globalization; using System.Linq; using System.Xml; @@ -53,7 +54,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override IContent PerformGet(int id) { - var sql = GetBaseQuery(false) + var sql = GetBaseQuery(BaseQueryType.FullSingle) .Where(GetBaseWhereClause(), new { Id = id }) .Where(x => x.Newest, SqlSyntax) .OrderByDescending(x => x.VersionDate, SqlSyntax); @@ -81,7 +82,7 @@ namespace Umbraco.Core.Persistence.Repositories return s; }; - var sqlBaseFull = GetBaseQuery(BaseQueryType.Full); + var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple); var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids); return ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds))); @@ -89,7 +90,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override IEnumerable PerformGetByQuery(IQuery query) { - var sqlBaseFull = GetBaseQuery(BaseQueryType.Full); + var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple); var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids); Func, Sql> translate = (translator) => @@ -110,6 +111,18 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of PetaPocoRepositoryBase + /// + /// Returns the base query to return Content + /// + /// + /// + /// + /// Content queries will differ depending on what needs to be returned: + /// * FullSingle: When querying for a single document, this will include the Outer join to fetch the content item's published version info + /// * FullMultiple: When querying for multiple documents, this will exclude the Outer join to fetch the content item's published version info - this info would need to be fetched separately + /// * Ids: This would essentially be the same as FullMultiple however the columns specified will only return the Ids for the documents + /// * Count: A query to return the count for documents + /// protected override Sql GetBaseQuery(BaseQueryType queryType) { var sql = new Sql(); @@ -122,14 +135,14 @@ namespace Umbraco.Core.Persistence.Repositories .InnerJoin(SqlSyntax) .On(SqlSyntax, left => left.NodeId, right => right.NodeId); - if (queryType == BaseQueryType.Full) + if (queryType == BaseQueryType.FullSingle) { //The only reason we apply this left outer join is to be able to pull back the DocumentPublishedReadOnlyDto //information with the entire data set, so basically this will get both the latest document and also it's published - //version if it has one. When performing a count or when just retrieving Ids like in paging, this is unecessary + //version if it has one. When performing a count or when retrieving Ids like in paging, this is unecessary //and causes huge performance overhead for the SQL server, especially when sorting the result. - //To fix this perf overhead we'd need another index on : - // CREATE NON CLUSTERED INDEX ON cmsDocument.node + cmsDocument.published + //We also don't include this outer join when querying for multiple entities since it is much faster to fetch this information + //in a separate query. For a single entity this is ok. var sqlx = string.Format("LEFT OUTER JOIN {0} {1} ON ({1}.{2}={0}.{2} AND {1}.{3}=1)", SqlSyntax.GetQuotedTableName("cmsDocument"), @@ -151,7 +164,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Sql GetBaseQuery(bool isCount) { - return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.Full); + return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle); } protected override string GetBaseWhereClause() @@ -222,7 +235,7 @@ namespace Umbraco.Core.Persistence.Repositories while (true) { // get the next group of nodes - var sqlFull = translate(baseId, GetBaseQuery(BaseQueryType.Full)); + var sqlFull = translate(baseId, GetBaseQuery(BaseQueryType.FullMultiple)); var sqlIds = translate(baseId, GetBaseQuery(BaseQueryType.Ids)); var xmlItems = ProcessQuery(SqlSyntax.SelectTop(sqlFull, groupSize), new PagingSqlQuery(SqlSyntax.SelectTop(sqlIds, groupSize))) @@ -245,7 +258,7 @@ namespace Umbraco.Core.Persistence.Repositories Logger.Error("Could not rebuild XML for nodeId=" + xmlItem.NodeId, e); } } - baseId = xmlItems.Last().NodeId; + baseId = xmlItems[xmlItems.Count - 1].NodeId; } } @@ -257,7 +270,7 @@ namespace Umbraco.Core.Persistence.Repositories .OrderByDescending(x => x.VersionDate, SqlSyntax); }; - var sqlFull = translate(GetBaseQuery(BaseQueryType.Full)); + var sqlFull = translate(GetBaseQuery(BaseQueryType.FullMultiple)); var sqlIds = translate(GetBaseQuery(BaseQueryType.Ids)); return ProcessQuery(sqlFull, new PagingSqlQuery(sqlIds), true); @@ -265,7 +278,7 @@ namespace Umbraco.Core.Persistence.Repositories public override IContent GetByVersion(Guid versionId) { - var sql = GetBaseQuery(false); + var sql = GetBaseQuery(BaseQueryType.FullSingle); sql.Where("cmsContentVersion.VersionId = @VersionId", new { VersionId = versionId }); sql.OrderByDescending(x => x.VersionDate, SqlSyntax); @@ -674,7 +687,7 @@ namespace Umbraco.Core.Persistence.Repositories // ORDER BY substring(path, 1, len(path) - charindex(',', reverse(path))), sortOrder // but that's probably an overkill - sorting by level,sortOrder should be enough - var sqlFull = GetBaseQuery(BaseQueryType.Full); + var sqlFull = GetBaseQuery(BaseQueryType.FullMultiple); var translatorFull = new SqlTranslator(sqlFull, query); var sqlIds = GetBaseQuery(BaseQueryType.Ids); var translatorIds = new SqlTranslator(sqlIds, query); @@ -889,12 +902,12 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", return base.GetDatabaseFieldNameForOrderBy(orderBy); } - + /// /// This is the underlying method that processes most queries for this repository /// /// - /// The full SQL with the outer join to return all data required to create an IContent + /// The FullMultiple SQL without the outer join to return all data required to create an IContent excluding it's published state data which this will query separately /// /// /// The Id SQL without the outer join to just return all document ids - used to process the properties for the content item @@ -904,8 +917,43 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", private IEnumerable ProcessQuery(Sql sqlFull, PagingSqlQuery pagingSqlQuery, bool withCache = false) { // fetch returns a list so it's ok to iterate it in this method - var dtos = Database.Fetch(sqlFull); + var dtos = Database.Fetch(sqlFull); if (dtos.Count == 0) return Enumerable.Empty(); + + //Go and get all of the published version data separately for this data, this is because when we are querying + //for multiple content items we don't include the outer join to fetch this data in the same query because + //it is insanely slow. Instead we just fetch the published version data separately in one query. + + //we need to parse the original SQL statement and reduce the columns to just cmsDocument.nodeId so that we can use + // the statement to go get the published data for all of the items by using an inner join + var parsedOriginalSql = "SELECT cmsDocument.nodeId " + sqlFull.SQL.Substring(sqlFull.SQL.IndexOf("FROM", StringComparison.Ordinal)); + //now remove everything from an Orderby clause and beyond + if (parsedOriginalSql.InvariantContains("ORDER BY ")) + { + parsedOriginalSql = parsedOriginalSql.Substring(0, parsedOriginalSql.LastIndexOf("ORDER BY ", StringComparison.Ordinal)); + } + + var publishedSql = new Sql(@"SELECT * +FROM cmsDocument AS doc2 +INNER JOIN + (" + parsedOriginalSql + @") as docData +ON doc2.nodeId = docData.nodeId +WHERE doc2.published = 1 +ORDER BY doc2.nodeId +", sqlFull.Arguments); + + //go and get the published version data, we do a Query here and not a Fetch so we are + //not allocating a whole list to memory just to allocate another list in memory since + //we are assigning this data to a keyed collection for fast lookup below + var publishedData = Database.Query(publishedSql); + var publishedDataCollection = new DocumentPublishedReadOnlyDtoCollection(); + foreach (var publishedDto in publishedData) + { + //double check that there's no corrupt db data, there should only be a single published item + if (publishedDataCollection.Contains(publishedDto.NodeId) == false) + publishedDataCollection.Add(publishedDto); + } + var content = new IContent[dtos.Count]; var defs = new List(); @@ -919,6 +967,8 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", for (var i = 0; i < dtos.Count; i++) { var dto = dtos[i]; + DocumentPublishedReadOnlyDto publishedDto; + publishedDataCollection.TryGetValue(dto.NodeId, out publishedDto); // if the cache contains the published version, use it if (withCache) @@ -946,7 +996,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", contentTypes[dto.ContentVersionDto.ContentDto.ContentTypeId] = contentType; } - content[i] = ContentFactory.BuildEntity(dto, contentType); + content[i] = ContentFactory.BuildEntity(dto, contentType, publishedDto); // need template if (dto.TemplateId.HasValue && dto.TemplateId.Value > 0) @@ -1055,7 +1105,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", return currentName; } - + /// /// Dispose disposable properties /// @@ -1070,5 +1120,26 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder", _contentPreviewRepository.Dispose(); _contentXmlRepository.Dispose(); } + + /// + /// A keyed collection for fast lookup when retrieving a separate list of published version data + /// + private class DocumentPublishedReadOnlyDtoCollection : KeyedCollection + { + protected override int GetKeyForItem(DocumentPublishedReadOnlyDto item) + { + return item.NodeId; + } + + public bool TryGetValue(int key, out DocumentPublishedReadOnlyDto val) + { + if (Dictionary == null) + { + val = null; + return false; + } + return Dictionary.TryGetValue(key, out val); + } + } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 56b5e2ed9d..53b04e1322 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Sql GetBaseQuery(bool isCount) { - return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.Full); + return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle); } protected override string GetBaseWhereClause() diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 9fdee650b3..ae8cb08255 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -129,7 +129,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Sql GetBaseQuery(bool isCount) { - return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.Full); + return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle); } protected override string GetBaseWhereClause() diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 6b18fc70b4..df96112a30 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs @@ -442,7 +442,7 @@ namespace Umbraco.Core.Persistence.Repositories // Get base query for returning IDs var sqlBaseIds = GetBaseQuery(BaseQueryType.Ids); // Get base query for returning all data - var sqlBaseFull = GetBaseQuery(BaseQueryType.Full); + var sqlBaseFull = GetBaseQuery(BaseQueryType.FullMultiple); if (query == null) query = new Query(); var translatorIds = new SqlTranslator(sqlBaseIds, query); @@ -773,7 +773,6 @@ ORDER BY contentNodeId, propertytypeid /// protected abstract Sql GetBaseQuery(BaseQueryType queryType); - internal class DocumentDefinition { /// From f2fd45576bd2e95956bf88ca489f72c9c95a149d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 09:35:01 +0100 Subject: [PATCH 13/58] speed up animations --- src/Umbraco.Web.UI.Client/src/less/components/umb-table.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 878875ae3c..f51536ae24 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -299,7 +299,7 @@ input.umb-table__input { .animate-enter, .animate-leave { - transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; position: relative; display: block; } @@ -327,7 +327,7 @@ input.umb-table__input { .animate-reverse-enter, .animate-reverse-leave { - transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; position: relative; display: block; } From c82bddb7dd416386c541137b78cd6ed1c64619e2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 09:51:13 +0100 Subject: [PATCH 14/58] remove fake list view search node --- .../treepicker/treepicker.controller.js | 53 +------------------ 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 6ad0665424..d92f982590 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -111,9 +111,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } function nodeExpandedHandler(ev, args) { - - console.log("args", args); - + + // open mini list view for list views if (args.node.metaData.isContainer) { openMiniListView(args.node); } @@ -123,54 +122,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", //iterate children _.each(args.children, function (child) { - console.log("child", child); - - //check if any of the items are list views, if so we need to add some custom - // children: A node to activate the search, any nodes that have already been - // selected in the search - /* - if (child.metaData.isContainer) { - child.hasChildren = true; - child.children = [ - { - id: child.id, - level: child.level + 1, - hasChildren: false, - parent: function () { - return child; - }, - name: searchText, - metaData: { - listViewNode: child, - }, - cssClass: "icon-search", - cssClasses: ["not-published"] - } - ]; - //add base transition classes to this node - child.cssClasses.push("tree-node-slide-up"); - - var listViewResults = _.filter($scope.searchInfo.selectedSearchResults, function(i) { - return i.parentId == child.id; - }); - _.each(listViewResults, function(item) { - child.children.unshift({ - id: item.id, - name: item.name, - cssClass: "icon umb-tree-icon sprTree " + item.icon, - level: child.level + 1, - metaData: { - isSearchResult: true - }, - hasChildren: false, - parent: function () { - return child; - } - }); - }); - } - */ - //now we need to look in the already selected search results and // toggle the check boxes for those ones that are listed var exists = _.find($scope.searchInfo.selectedSearchResults, function (selected) { From 8b9a5000be136c721a994850ecb9a92b18fab4c3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 10:09:31 +0100 Subject: [PATCH 15/58] move back button styles to class --- .../src/less/components/umb-mini-list-view.less | 9 +++++++++ .../src/views/common/overlays/treepicker/treepicker.html | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less index ebf4ef1290..1cf8f0e577 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -19,5 +19,14 @@ } .umb-mini-list-view__back { + font-size: 12px; + margin-right: 5px; + color: @grayMed; + display: block; +} +.umb-mini-list-view__back:hover { + opacity: 1; + text-decoration: none; + color: @black; } \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index 38e64965c1..5278433847 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -38,9 +38,10 @@
- + Date: Thu, 2 Feb 2017 10:19:54 +0100 Subject: [PATCH 16/58] clean up animation classes --- .../less/components/umb-mini-list-view.less | 58 +++++++++++++++++++ .../src/less/components/umb-table.less | 56 ------------------ .../treepicker/treepicker.controller.js | 6 +- .../overlays/treepicker/treepicker.html | 3 +- 4 files changed, 62 insertions(+), 61 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less index 1cf8f0e577..ebd56ca287 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -29,4 +29,62 @@ opacity: 1; text-decoration: none; color: @black; +} + +/* Animations */ + +/* Forward */ + +.umb-mini-list-view--forward-enter, +.umb-mini-list-view--forward-leave +{ + transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + position: relative; + display: block; +} + +.umb-mini-list-view--forward-enter { + left: 100%; +} + +.umb-mini-list-view--forward-enter.umb-mini-list-view--forward-enter-active { + left: 0; + opacity: 1; +} + +.umb-mini-list-view--forward-leave { + left: 0; +} + +.umb-mini-list-view--forward-leave.umb-mini-list-view--forward-leave-active{ + left: -100%; + opacity: 0; +} + +/* Backwards */ + +.umb-mini-list-view--backwards-enter, +.umb-mini-list-view--backwards-leave +{ + transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; + position: relative; + display: block; +} + +.umb-mini-list-view--backwards-enter { + right: 100%; +} + +.umb-mini-list-view--backwards-enter.umb-mini-list-view--backwards-enter-active { + right: 0; + opacity: 1; +} + +.umb-mini-list-view--backwards-leave { + left: 0; +} + +.umb-mini-list-view--backwards-leave.umb-mini-list-view--backwards-leave-active{ + right: -100%; + opacity: 0; } \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index f51536ae24..35d8f2513e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -292,60 +292,4 @@ input.umb-table__input { font-size: 20px; } -} - - -/* Forward */ -.animate-enter, -.animate-leave -{ - transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; - position: relative; - display: block; -} - -.animate-enter { - left: 100%; -} - -.animate-enter.animate-enter-active { - left: 0; - opacity: 1; -} - -.animate-leave { - left: 0; -} - -.animate-leave.animate-leave-active{ - left: -100%; - opacity: 0; -} - -/* Backwards */ - -.animate-reverse-enter, -.animate-reverse-leave -{ - transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all; - position: relative; - display: block; -} - -.animate-reverse-enter { - right: 100%; -} - -.animate-reverse-enter.animate-reverse-enter-active { - right: 0; - opacity: 1; -} - -.animate-reverse-leave { - left: 0; -} - -.animate-reverse-leave.animate-reverse-leave-active{ - right: -100%; - opacity: 0; } \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index d92f982590..9c4e068bdb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -628,11 +628,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } - $scope.animationTest = function() { + $scope.getMiniListViewAnimation = function() { if(goingForward) { - return 'animate'; + return 'umb-mini-list-view--forward'; } else { - return 'animate-reverse'; + return 'umb-mini-list-view--backwards'; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index 5278433847..dfbe021d54 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -36,8 +36,7 @@
-
- +
Back From 14b96da588b2cc9db330561df67ccff7223bed2d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 11:19:56 +0100 Subject: [PATCH 17/58] combine redundant resource code into one function --- .../treepicker/treepicker.controller.js | 105 ++++++++---------- 1 file changed, 46 insertions(+), 59 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 9c4e068bdb..b8863c190b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -1,6 +1,6 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", - function ($scope, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource, mediaResource, memberResource) { + function ($scope, $q, entityResource, eventsService, $log, searchService, angularHelper, $timeout, localizationService, treeService, contentResource, mediaResource, memberResource) { var tree = null; var dialogOptions = $scope.model; @@ -492,30 +492,12 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }); /* Mini List View */ - $scope.miniListView = {}; $scope.goToPage = function(pageNumber, miniListView) { - // set new page number miniListView.pagination.pageNumber = pageNumber; - - // start loading animation list view - miniListView.loading = true; - - resource(miniListView.node.id, miniListView.pagination) - .then(function (data) { - - // update children - miniListView.children = data.items; - - // update pagination - miniListView.pagination.totalItems = data.totalItems; - miniListView.pagination.totalPages = data.totalPages; - - // stop load indicator - miniListView.loading = false; - - }); + // get children + getChildrenForMiniListView(miniListView); }; $scope.selectListViewItem = function(item) { @@ -542,24 +524,10 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }; $scope.searchMiniListView = function(search, miniListView) { - + // set search value miniListView.pagination.filter = search; - miniListView.loading = true; - - resource(miniListView.node.id, miniListView.pagination) - .then(function (data) { - - // update children - miniListView.children = data.items; - - // update pagination - miniListView.pagination.totalItems = data.totalItems; - miniListView.pagination.totalPages = data.totalPages; - - // stop load indicator - miniListView.loading = false; - - }); + // get children + getChildrenForMiniListView(miniListView); }; $scope.test = function(node) { @@ -567,19 +535,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }; $scope.miniListViews = []; - var miniListViewsHistory = []; - var resource = ""; var goingForward = true; - if (entityType === "Document") { - resource = contentResource.getChildren; - } else if (entityType === "Member") { - resource = memberResource.getPagedResults; - } else if (entityType === "Media") { - resource = mediaResource.getChildren; - } - function openMiniListView(node) { goingForward = true; @@ -600,10 +558,44 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", // start loading animation on node node.loading = true; - resource(node.id, miniListView.pagination) - .then(function (data) { + getChildrenForMiniListView(miniListView) + .then(function(data){ - console.log("data data data", data); + // stop loading animation on node + node.loading = false; + + // clear and push mini list view in dom so we only render 1 view + $scope.miniListViews = []; + $scope.miniListViews.push(miniListView); + + // store in history so we quickly can navigate back + miniListViewsHistory.push(miniListView); + + }); + + } + + function getChildrenForMiniListView(miniListView) { + + // setup promise + var deferred = $q.defer(); + + // start loading animation list view + miniListView.loading = true; + + // setup the correct resource depending on section + var resource = ""; + + if (entityType === "Document") { + resource = contentResource.getChildren; + } else if (entityType === "Member") { + resource = memberResource.getPagedResults; + } else if (entityType === "Media") { + resource = mediaResource.getChildren; + } + + resource(miniListView.node.id, miniListView.pagination) + .then(function (data) { // update children miniListView.children = data.items; @@ -615,16 +607,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", // stop load indicator miniListView.loading = false; - // stop loading animation on node - node.loading = false; - - $scope.miniListViews = []; - $scope.miniListViews.push(miniListView); - miniListViewsHistory.push(miniListView); - - console.log("history", miniListViewsHistory); + deferred.resolve(data); }); + + return deferred.promise; } From 77a91bc0171ccde9cbb7dd5464b51def65db73fe Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 11:28:56 +0100 Subject: [PATCH 18/58] fix entity look up --- .../views/common/overlays/treepicker/treepicker.controller.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index b8863c190b..4adb1dd276 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -72,8 +72,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.enableSearh = true; //if a alternative startnode is used, we need to check if it is a container - if (dialogOptions.startNodeId) { - + if (dialogOptions.startNodeId !== "-1") { entityResource.getById(dialogOptions.startNodeId, entityType).then(function (node) { if (node.metaData.IsContainer) { openMiniListView(node); From 7004765acfa08601f1e9c6e551a26fe9849da2f0 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 11:40:53 +0100 Subject: [PATCH 19/58] remove unused code --- .../treepicker/treepicker.controller.js | 28 ++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 4adb1dd276..5418a6349c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -146,31 +146,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", args.event.preventDefault(); args.event.stopPropagation(); - if (args.node.metaData.listViewNode) { - //check if list view 'search' node was selected - - //alert("list view"); - - $scope.showMiniListView = true; - - console.log(args); - - $scope.pagination = { - pageSize: 10, - pageNumber: 1, - filter: '', - orderDirection: "Ascending", - orderBy: "SortOrder", - orderBySystemField: true - }; - - getPagedChildren(args.node); - - $scope.miniListView.nodeName = args.node.metaData.listViewNode.name; - $scope.miniListView.nodeId = args.node.metaData.listViewNode.id; - - } - else if (args.node.metaData.isSearchResult) { + if (args.node.metaData.isSearchResult) { //check if the item selected was a search result from a list view //unselect @@ -596,6 +572,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", resource(miniListView.node.id, miniListView.pagination) .then(function (data) { + console.log("data, data, data", data); + // update children miniListView.children = data.items; From b4450ca7f2bcaa657a1391863da9364e0a2959e1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Feb 2017 11:44:13 +0100 Subject: [PATCH 20/58] add null check for startNode --- .../views/common/overlays/treepicker/treepicker.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 5418a6349c..8a8f0f10c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -72,7 +72,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.enableSearh = true; //if a alternative startnode is used, we need to check if it is a container - if (dialogOptions.startNodeId !== "-1") { + if (dialogOptions.startNodeId && dialogOptions.startNodeId !== -1) { entityResource.getById(dialogOptions.startNodeId, entityType).then(function (node) { if (node.metaData.IsContainer) { openMiniListView(node); From 02785eea42247bdfb32d8cd64910de457d937704 Mon Sep 17 00:00:00 2001 From: Richard Soeteman Date: Mon, 6 Feb 2017 11:26:58 +0100 Subject: [PATCH 21/58] Fixed issue U4-9493 --- .../businesslogic/propertytype/propertytype.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs index e041306ba3..a6dbf440ec 100644 --- a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs +++ b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs @@ -73,12 +73,12 @@ namespace umbraco.cms.businesslogic.propertytype } _sortOrder = found.sortOrder; - _alias = found.alias; - _name = found.name; + _alias = found.Alias; + _name = found.Name; _validationRegExp = found.validationRegExp; - _DataTypeId = found.DataTypeId; + _DataTypeId = found.dataTypeId; _contenttypeid = found.contentTypeId; - _description = found.description; + _description = found.Description; } #endregion From a3c7b1fcfee6a10da3cb456e0fdaaa69afb2af58 Mon Sep 17 00:00:00 2001 From: Richard Soeteman Date: Mon, 6 Feb 2017 11:51:44 +0100 Subject: [PATCH 22/58] Fixed issue U4-9494 --- src/umbraco.cms/businesslogic/propertytype/propertytype.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs index a6dbf440ec..8d5f538fd9 100644 --- a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs +++ b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs @@ -72,6 +72,7 @@ namespace umbraco.cms.businesslogic.propertytype _tabId = _propertyTypeGroup; } + //Fixed issue U4-9493 Case issues _sortOrder = found.sortOrder; _alias = found.Alias; _name = found.Name; From 925c343a30638781f5abcdceb689f72221dd6dff Mon Sep 17 00:00:00 2001 From: Claus Date: Tue, 7 Feb 2017 10:00:34 +0100 Subject: [PATCH 23/58] U4-9351 Add events for package install/uninstall --- .../Events/UninstallPackageEventArgs.cs | 26 ++++++++ .../Packaging/Models/UninstallationSummary.cs | 42 +++++++++++++ src/Umbraco.Core/Services/PackagingService.cs | 25 +++++++- src/Umbraco.Core/Umbraco.Core.csproj | 2 + .../Editors/PackageInstallController.cs | 38 +++++++++++- .../businesslogic/Packager/Installer.cs | 24 ++++++- .../PackageInstance/InstalledPackage.cs | 62 +++++++++++++++++++ 7 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 src/Umbraco.Core/Events/UninstallPackageEventArgs.cs create mode 100644 src/Umbraco.Core/Packaging/Models/UninstallationSummary.cs diff --git a/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs b/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs new file mode 100644 index 0000000000..1371942c2b --- /dev/null +++ b/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using Umbraco.Core.Packaging.Models; + +namespace Umbraco.Core.Events +{ + internal class UninstallPackageEventArgs : CancellableObjectEventArgs> + { + private readonly MetaData _packageMetaData; + + public UninstallPackageEventArgs(TEntity eventObject, bool canCancel) + : base(new[] { eventObject }, canCancel) + { + } + + public UninstallPackageEventArgs(TEntity eventObject, MetaData packageMetaData) + : base(new[] { eventObject }) + { + _packageMetaData = packageMetaData; + } + + public MetaData PackageMetaData + { + get { return _packageMetaData; } + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Packaging/Models/UninstallationSummary.cs b/src/Umbraco.Core/Packaging/Models/UninstallationSummary.cs new file mode 100644 index 0000000000..13bb4bfc77 --- /dev/null +++ b/src/Umbraco.Core/Packaging/Models/UninstallationSummary.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Runtime.Serialization; +using Umbraco.Core.Models; + +namespace Umbraco.Core.Packaging.Models +{ + [Serializable] + [DataContract(IsReference = true)] + internal class UninstallationSummary + { + public MetaData MetaData { get; set; } + public IEnumerable DataTypesUninstalled { get; set; } + public IEnumerable LanguagesUninstalled { get; set; } + public IEnumerable DictionaryItemsUninstalled { get; set; } + public IEnumerable MacrosUninstalled { get; set; } + public IEnumerable FilesUninstalled { get; set; } + public IEnumerable TemplatesUninstalled { get; set; } + public IEnumerable ContentTypesUninstalled { get; set; } + public IEnumerable StylesheetsUninstalled { get; set; } + public IEnumerable ContentUninstalled { get; set; } + public bool PackageUninstalled { get; set; } + } + + internal static class UninstallationSummaryExtentions + { + public static UninstallationSummary InitEmpty(this UninstallationSummary summary) + { + summary.ContentUninstalled = new List(); + summary.ContentTypesUninstalled = new List(); + summary.DataTypesUninstalled = new List(); + summary.DictionaryItemsUninstalled = new List(); + summary.FilesUninstalled = new List(); + summary.LanguagesUninstalled = new List(); + summary.MacrosUninstalled = new List(); + summary.MetaData = new MetaData(); + summary.TemplatesUninstalled = new List(); + summary.PackageUninstalled = false; + return summary; + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index 4d8a2773ba..dc75478e28 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/src/Umbraco.Core/Services/PackagingService.cs @@ -1715,6 +1715,24 @@ namespace Umbraco.Core.Services #region Package Building #endregion + /// + /// This method can be used to trigger the 'ImportedPackage' event when a package is installed by something else but this service. + /// + /// + internal static void OnImportedPackage(ImportPackageEventArgs args) + { + ImportedPackage.RaiseEvent(args, null); + } + + /// + /// This method can be used to trigger the 'UninstalledPackage' event when a package is uninstalled by something else but this service. + /// + /// + internal static void OnUninstalledPackage(UninstallPackageEventArgs args) + { + UninstalledPackage.RaiseEvent(args, null); + } + #region Event Handlers /// /// Occurs before Importing Content @@ -1875,10 +1893,15 @@ namespace Umbraco.Core.Services internal static event TypedEventHandler> ImportingPackage; /// - /// Occurs after a apckage is imported + /// Occurs after a package is imported /// internal static event TypedEventHandler> ImportedPackage; + /// + /// Occurs after a package is uninstalled + /// + internal static event TypedEventHandler> UninstalledPackage; + #endregion } } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 33f7e63e92..707257a234 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -314,6 +314,7 @@ + @@ -440,6 +441,7 @@ + diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index f984eeb468..99e37b610c 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -15,9 +15,11 @@ using umbraco.cms.presentation.Trees; using umbraco.presentation.developer.packages; using Umbraco.Core; using Umbraco.Core.Configuration; +using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; +using Umbraco.Core.Packaging.Models; using Umbraco.Core.Services; using Umbraco.Web.Models; using Umbraco.Web.Models.ContentEditing; @@ -81,7 +83,14 @@ namespace Umbraco.Web.Editors if (pack == null) throw new ArgumentNullException("pack"); var refreshCache = false; - + + var removedTemplates = new List(); + var removedMacros = new List(); + var removedContentTypes = new List(); + var removedDictionaryItems = new List(); + var removedDataTypes = new List(); + var removedFiles = new List(); + //Uninstall templates foreach (var item in pack.Data.Templates.ToArray()) { @@ -90,6 +99,9 @@ namespace Umbraco.Web.Editors var found = Services.FileService.GetTemplate(nId); if (found != null) { + removedTemplates.Add(found); + // add the actual file here, since deleting the template cause a file delete + removedFiles.Add(found.VirtualPath); ApplicationContext.Services.FileService.DeleteTemplate(found.Alias, Security.GetUserId()); } pack.Data.Templates.Remove(nId.ToString()); @@ -103,6 +115,7 @@ namespace Umbraco.Web.Editors var macro = Services.MacroService.GetById(nId); if (macro != null) { + removedMacros.Add(macro); Services.MacroService.Delete(macro); } pack.Data.Macros.Remove(nId.ToString()); @@ -131,6 +144,7 @@ namespace Umbraco.Web.Editors select contentType; foreach (var contentType in orderedTypes) { + removedContentTypes.Add(contentType); contentTypeService.Delete(contentType); } } @@ -143,6 +157,7 @@ namespace Umbraco.Web.Editors var di = Services.LocalizationService.GetDictionaryItemById(nId); if (di != null) { + removedDictionaryItems.Add(di); Services.LocalizationService.Delete(di); } pack.Data.DictionaryItems.Remove(nId.ToString()); @@ -156,6 +171,7 @@ namespace Umbraco.Web.Editors var dtd = Services.DataTypeService.GetDataTypeDefinitionById(nId); if (dtd != null) { + removedDataTypes.Add(dtd); Services.DataTypeService.Delete(dtd); } pack.Data.DataTypes.Remove(nId.ToString()); @@ -208,15 +224,31 @@ namespace Umbraco.Web.Editors var filePath = IOHelper.MapPath(file); if (File.Exists(filePath)) { + removedFiles.Add(filePath); File.Delete(filePath); - } } pack.Data.Files.Remove(file); } pack.Save(); pack.Delete(Security.GetUserId()); - + + // create a summary of what was actually removed, for PackagingService.UninstalledPackage + var summary = new UninstallationSummary + { + MetaData = pack.GetMetaData(), + TemplatesUninstalled = removedTemplates, + MacrosUninstalled = removedMacros, + ContentTypesUninstalled = removedContentTypes, + DictionaryItemsUninstalled = removedDictionaryItems, + DataTypesUninstalled = removedDataTypes, + FilesUninstalled = removedFiles, + PackageUninstalled = true + }; + + // trigger the UninstalledPackage event + PackagingService.OnUninstalledPackage(new UninstallPackageEventArgs(summary, false)); + //TODO: Legacy - probably not needed if (refreshCache) { diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 1f17da3922..e97b9317d8 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -14,16 +14,18 @@ using Umbraco.Core.Packaging; using umbraco.cms.businesslogic.web; using umbraco.BusinessLogic; using System.Diagnostics; -using umbraco.cms.businesslogic.macro; using umbraco.cms.businesslogic.template; using umbraco.interfaces; +using Umbraco.Core.Events; +using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Services; namespace umbraco.cms.businesslogic.packager { /// /// The packager is a component which enables sharing of both data and functionality components between different umbraco installations. /// - /// The output is a .umb (a zip compressed file) which contains the exported documents/medias/macroes/documenttypes (etc.) + /// The output is a .umb (a zip compressed file) which contains the exported documents/medias/macros/documenttypes (etc.) /// in a Xml document, along with the physical files used (images/usercontrols/xsl documents etc.) /// /// Partly implemented, import of packages is done, the export is *under construction*. @@ -507,6 +509,7 @@ namespace umbraco.cms.businesslogic.packager } OnPackageBusinessLogicInstalled(insPack); + OnPackageInstalled(insPack); } } @@ -517,6 +520,7 @@ namespace umbraco.cms.businesslogic.packager /// public void InstallCleanUp(int packageId, string tempDir) { + if (Directory.Exists(tempDir)) { Directory.Delete(tempDir, true); @@ -814,5 +818,21 @@ namespace umbraco.cms.businesslogic.packager EventHandler handler = PackageBusinessLogicInstalled; if (handler != null) handler(null, e); } + + private void OnPackageInstalled(InstalledPackage insPack) + { + // getting an InstallationSummary for sending to the PackagingService.ImportedPackage event + var fileService = ApplicationContext.Current.Services.FileService; + var macroService = ApplicationContext.Current.Services.MacroService; + var contentTypeService = ApplicationContext.Current.Services.ContentTypeService; + var dataTypeService = ApplicationContext.Current.Services.DataTypeService; + var localizationService = ApplicationContext.Current.Services.LocalizationService; + + var installationSummary = insPack.GetInstallationSummary(contentTypeService, dataTypeService, fileService, localizationService, macroService); + installationSummary.PackageInstalled = true; + + var args = new ImportPackageEventArgs(installationSummary, false); + PackagingService.OnImportedPackage(args); + } } } diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index 974f398ca7..a5ae2f5015 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using Umbraco.Core.Auditing; using Umbraco.Core.Logging; using Umbraco.Core.IO; +using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Services; namespace umbraco.cms.businesslogic.packager { public class InstalledPackage @@ -124,5 +127,64 @@ namespace umbraco.cms.businesslogic.packager { if (AfterDelete != null) AfterDelete(this, e); } + + /// + /// Used internally for creating an InstallationSummary (used in new PackagingService) representation of this InstalledPackage object. + /// + /// + /// + /// + /// + /// + /// + internal InstallationSummary GetInstallationSummary(IContentTypeService contentTypeService, IDataTypeService dataTypeService, IFileService fileService, ILocalizationService localizationService, IMacroService macroService) + { + var macros = TryGetIntegerIds(Data.Macros).Select(macroService.GetById).ToList(); + var templates = TryGetIntegerIds(Data.Templates).Select(fileService.GetTemplate).ToList(); + var contentTypes = TryGetIntegerIds(Data.Documenttypes).Select(contentTypeService.GetContentType).ToList(); + var dataTypes = TryGetIntegerIds(Data.DataTypes).Select(dataTypeService.GetDataTypeDefinitionById).ToList(); + var dictionaryItems = TryGetIntegerIds(Data.DictionaryItems).Select(localizationService.GetDictionaryItemById).ToList(); + var languages = TryGetIntegerIds(Data.Languages).Select(localizationService.GetLanguageById).ToList(); + + return new InstallationSummary + { + ContentTypesInstalled = contentTypes, + DataTypesInstalled = dataTypes, + DictionaryItemsInstalled = dictionaryItems, + FilesInstalled = Data.Files, + LanguagesInstalled = languages, + MacrosInstalled = macros, + MetaData = GetMetaData(), + TemplatesInstalled = templates, + }; + } + + internal MetaData GetMetaData() + { + return new MetaData() + { + AuthorName = Data.Author, + AuthorUrl = Data.AuthorUrl, + Control = Data.LoadControl, + License = Data.License, + LicenseUrl = Data.LicenseUrl, + Name = Data.Name, + Readme = Data.Readme, + Url = Data.Url, + Version = Data.Version + }; + } + + private static IEnumerable TryGetIntegerIds(IEnumerable ids) + { + var intIds = new List(); + foreach (var id in ids) + { + int parsed; + if (int.TryParse(id, out parsed)) + intIds.Add(parsed); + } + return intIds; + } } } From 912a6a52ccc359ac26c0c233a8e41179bbca160b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 7 Feb 2017 10:10:37 +0100 Subject: [PATCH 24/58] fixes: U4-9472 Mini list view: show published/unpublished state of node --- .../src/less/components/umb-table.less | 4 ++++ src/Umbraco.Web.UI.Client/src/less/variables.less | 3 ++- .../src/views/components/umb-mini-list-view.html | 8 +++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 35d8f2513e..a4ebd57fe3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -260,6 +260,10 @@ input.umb-table__input { flex: 0 0 auto !important; } +.umb-table-cell--faded { + opacity: 0.4; +} + // Increases the space for the name cell .umb-table__name { diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 8ebb0f08ef..e7b8517447 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -36,6 +36,7 @@ .red{color: @red;} .blue{color: @blue;} +.black{color: @black;} //icon colors for tree icons @@ -351,4 +352,4 @@ // SORTABLE // -------------------------------------------------- @sortableHelperBg: rgba(4, 156, 219, 0.5); -@sortablePlaceholderBg : @blue; \ No newline at end of file +@sortablePlaceholderBg : @blue; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 185d446d67..3cf1165a51 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -43,17 +43,15 @@
-
+ ng-class="{'-selected':child.selected}"> +
 
-
{{ child.name }}
+
{{ child.name }}
From 2669c68df06be916aa846851da675282238efbfd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 7 Feb 2017 11:55:45 +0100 Subject: [PATCH 25/58] fixes: U4-9468 Mini list view: add empty state for no children + no search result --- .../components/umbminilistview.directive.js | 18 +++++----------- .../src/less/components/umb-table.less | 21 +++++++++++-------- .../treepicker/treepicker.controller.js | 18 +++++++++++++--- .../views/components/umb-mini-list-view.html | 8 ++++++- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 2 ++ 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 9ddd2266dc..c45f77b44c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -21,20 +21,12 @@ }; scope.searchMiniListView = function() { - searchMiniListView(); - }; - - var searchMiniListView = _.debounce(function () { - - scope.$apply(function () { - if (scope.search !== null && scope.search !== undefined) { - if(scope.onSearch) { - scope.onSearch({"search": scope.search}); - } + if (scope.search !== null && scope.search !== undefined) { + if(scope.onSearch) { + scope.onSearch({"search": scope.search}); } - }); - - }, 500); + } + }; } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index a4ebd57fe3..9cf1b3cfc8 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -204,30 +204,33 @@ input.umb-table__input { } } - - - - - // Table Row Styles .umb-table-row { display: flex; flex-flow: row nowrap; align-items: center; - user-select: none; } +.umb-table-body .umb-table-row--empty { + flex: 1 1 auto; + display: flex; + justify-content: center; + padding: 5px 0; + cursor: auto; + user-select: auto; +} +.umb-table-body .umb-table-row--empty:hover { + background-color: transparent; + cursor: auto; +} .umb-table-row.-selected, .umb-table-row.-selected:hover { background-color: fade(@blueDark, 4%); } - - - // Table Cell Styles .umb-table-cell { display: flex; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 8a8f0f10c6..bd6264cefb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -499,10 +499,14 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }; $scope.searchMiniListView = function(search, miniListView) { + // set search value - miniListView.pagination.filter = search; - // get children - getChildrenForMiniListView(miniListView); + miniListView.pagination.filter = search; + // start loading animation list view + miniListView.loading = true; + + searchMiniListView(miniListView); + }; $scope.test = function(node) { @@ -513,6 +517,14 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", var miniListViewsHistory = []; var goingForward = true; + + var searchMiniListView = _.debounce(function (miniListView) { + $scope.$apply(function () { + // get children + getChildrenForMiniListView(miniListView); + }); + }, 500); + function openMiniListView(node) { goingForward = true; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 3cf1165a51..403d076789 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -55,7 +55,13 @@
-
+
+ + +
+ + +
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 444ecc2e3d..b9713df07b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -491,6 +491,8 @@ Retry Permissions Search + Sorry, we can not find what you are looking for + No items have been added Server Show Show page on Send From 2ba5627e2cc11aec98e034fa10fd20576c3c37cf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 7 Feb 2017 15:57:53 +0100 Subject: [PATCH 26/58] fixes: U4-9471 Mini list view: show breadcrumb instead of back button --- .../editor/umbbreadcrumbs.directive.js | 53 +++++++++++++------ .../less/components/umb-mini-list-view.less | 5 -- .../treepicker/treepicker.controller.js | 53 ++++++++++++------- .../overlays/treepicker/treepicker.html | 17 ++++-- .../components/editor/umb-breadcrumbs.html | 17 +++--- .../views/components/umb-mini-list-view.html | 5 -- 6 files changed, 96 insertions(+), 54 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js index f2797425c5..61906bbf74 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js @@ -40,27 +40,50 @@ Use this directive to generate a list of breadcrumbs. @param {array} ancestors Array of ancestors @param {string} entityType The content entity type (member, media, content). +@param {callback} Callback when an ancestor is clicked. It will override the default link behaviour. **/ -(function() { - 'use strict'; +(function () { + 'use strict'; - function BreadcrumbsDirective() { + function BreadcrumbsDirective() { - var directive = { - restrict: 'E', - replace: true, - templateUrl: 'views/components/editor/umb-breadcrumbs.html', - scope: { - ancestors: "=", - entityType: "@" - } - }; + function link(scope, el, attr, ctrl) { - return directive; + scope.allowOnOpen = false; - } + scope.open = function(ancestor) { + if(scope.onOpen && scope.allowOnOpen) { + scope.onOpen({'ancestor': ancestor}); + } + }; - angular.module('umbraco.directives').directive('umbBreadcrumbs', BreadcrumbsDirective); + function onInit() { + if ("onOpen" in attr) { + scope.allowOnOpen = true; + } + } + + onInit(); + + } + + var directive = { + restrict: 'E', + replace: true, + templateUrl: 'views/components/editor/umb-breadcrumbs.html', + scope: { + ancestors: "=", + entityType: "@", + onOpen: "&" + }, + link: link + }; + + return directive; + + } + + angular.module('umbraco.directives').directive('umbBreadcrumbs', BreadcrumbsDirective); })(); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less index ebd56ca287..92871abd34 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -1,11 +1,6 @@ -.umb-mini-list-view { - -} - .umb-mini-list-view__title { display: flex; align-items: center; - margin-bottom: 10px; } .umb-mini-list-view__title-text { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index bd6264cefb..bdcd942474 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -466,7 +466,11 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); }); - /* Mini List View */ + /* --- Mini List View --- */ + $scope.miniListViews = []; + $scope.breadcrumb = []; + var miniListViewsHistory = []; + var goingForward = true; $scope.goToPage = function(pageNumber, miniListView) { // set new page number @@ -481,17 +485,31 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", item.selected = item.selected === true ? false : true; }; - $scope.exitMiniListView = function(node) { + $scope.clickBreadcrumb = function(ancestor) { + var found = false; goingForward = false; - if(miniListViewsHistory.length > 1) { - var prevMiniListViewIndex = miniListViewsHistory.length - 2; - var prevMiniListView = miniListViewsHistory[prevMiniListViewIndex]; - $scope.miniListViews = []; - $scope.miniListViews.push(prevMiniListView); - miniListViewsHistory.splice(-1,1); - } else { + angular.forEach(miniListViewsHistory, function(historyItem, index){ + if(parseInt(historyItem.node.id) === parseInt(ancestor.id)) { + + // load the list view from history + $scope.miniListViews = []; + $scope.miniListViews.push(historyItem); + // remove from history + miniListViewsHistory.splice(index, miniListViewsHistory.length - index); + found = true; + + // get ancestors + entityResource.getAncestors(historyItem.node.id, entityType) + .then(function (ancestors) { + $scope.breadcrumb = ancestors; + }); + } + }); + + if(!found) { + // if we can't find the view in the history miniListViewsHistory = []; $scope.miniListViews = []; } @@ -499,28 +517,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }; $scope.searchMiniListView = function(search, miniListView) { - // set search value miniListView.pagination.filter = search; // start loading animation list view miniListView.loading = true; - searchMiniListView(miniListView); - }; $scope.test = function(node) { openMiniListView(node); }; - $scope.miniListViews = []; - var miniListViewsHistory = []; - var goingForward = true; - - var searchMiniListView = _.debounce(function (miniListView) { $scope.$apply(function () { - // get children getChildrenForMiniListView(miniListView); }); }, 500); @@ -557,8 +566,14 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", // store in history so we quickly can navigate back miniListViewsHistory.push(miniListView); - + }); + + // get ancestors + entityResource.getAncestors(node.id, entityType) + .then(function (ancestors) { + $scope.breadcrumb = ancestors; + }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index dfbe021d54..a4b3c75982 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -35,12 +35,21 @@
- +
- - Back - +
+ +

{{ miniListView.node.name }}

+
+ + + -
  • +
  • + + + {{ancestor.name}} - {{ancestor.name}} - / + + {{ancestor.name}} - {{ancestor.name}} + / -
    • - + {{ancestor.name}} + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 403d076789..db3c6b1f3e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -1,10 +1,5 @@
    -
    - -

    {{ node.name }}

    -
    -
    From cda47ed5368be1061cd3edc96ce14eb06f60dfcf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 6 Feb 2017 14:46:48 +0100 Subject: [PATCH 27/58] add client side logic for scripts folder creation --- .../src/common/resources/codefile.resource.js | 32 +++++++++++++++ .../src/views/scripts/create.controller.js | 40 +++++++++++++++++-- .../src/views/scripts/create.html | 8 ++-- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js index e83bb4f14e..b6a56d336b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js @@ -205,6 +205,38 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) { "codeFileApiBaseUrl", "GetScaffold?type=" + type + "&id=" + id + "&snippetName=" + snippetName)), "Failed to get scaffold for" + type); + }, + + /** + * @ngdoc method + * @name umbraco.resources.codefileResource#createContainer + * @methodOf umbraco.resources.codefileResource + * + * @description + * Creates a container/folder + * + * ##usage + * 
    +         * codefileResource.createContainer("partialViews", "folder%2ffolder", "folder")
+         *    .then(function(data) {
+         *        alert('its here!');
+         *    });
+         *
    + * + * @param {string} File type: (scripts, partialViews, partialViewMacros). + * @param {string} Parent Id: url encoded path + * @param {string} Container name + * @returns {Promise} resourcePromise object. + * + */ + + createContainer: function(type, parentId, name) { + return umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl( + "codeFileApiBaseUrl", + "PostCreateContainer", + { type: type, parentId: parentId, name: name })), + 'Failed to create a folder under parent id ' + parentId); } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js index 1729693d83..89ff9e6643 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js @@ -1,13 +1,15 @@ (function () { "use strict"; - function ScriptsCreateController($scope, $location, navigationService) { + function ScriptsCreateController($scope, $location, navigationService, formHelper, codefileResource, localizationService) { var vm = this; var node = $scope.dialogOptions.currentNode; + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder"); vm.creatingFolder = false; vm.folderName = ""; + vm.createFolderError = ""; vm.fileExtension = ""; vm.createFile = createFile; @@ -23,8 +25,40 @@ vm.creatingFolder = true; } - function createFolder() { - + function createFolder(form) { + + if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { + + codefileResource.createContainer("scripts", node.id, vm.folderName).then(function(path) { + + navigationService.hideMenu(); + + navigationService.syncTree({ + tree: "scripts", + path: path, + forceReload: true, + activate: true + }); + + formHelper.resetForm({ + scope: $scope + }); + + var section = appState.getSectionState("currentSection"); + + }, function(err) { + + vm.createFolderError = err; + + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + }); + } + } } diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html index d57ead3b15..22b238606d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html @@ -22,12 +22,12 @@
    -
    -
    {{error.errorMsg}}
    -

    {{error.data.message}}

    +
    +
    {{vm.createFolderError.errorMsg}}
    +

    {{vm.createFolderError.data.message}}

    From 00982d4278e293a06adb8a3fa70c75eafe7c937c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 6 Feb 2017 15:04:46 +0100 Subject: [PATCH 28/58] add client side logic for partial views folder creation --- .../views/partialviews/create.controller.js | 37 ++++++++++++++++++- .../src/views/partialviews/create.html | 10 ++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js index 5aeaa28935..6fc2fff3a7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js @@ -1,14 +1,17 @@ (function () { "use strict"; - function PartialViewsCreateController($scope, codefileResource, $location, navigationService) { + function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService) { var vm = this; var node = $scope.dialogOptions.currentNode; + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder"); vm.snippets = []; vm.showSnippets = false; vm.creatingFolder = false; + vm.createFolderError = ""; + vm.folderName = ""; vm.createPartialView = createPartialView; vm.showCreateFolder = showCreateFolder; @@ -39,8 +42,38 @@ vm.creatingFolder = true; } - function createFolder() { + function createFolder(form) { + if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { + codefileResource.createContainer("partialViews", node.id, vm.folderName).then(function(path) { + + navigationService.hideMenu(); + + navigationService.syncTree({ + tree: "partialViews", + path: path, + forceReload: true, + activate: true + }); + + formHelper.resetForm({ + scope: $scope + }); + + var section = appState.getSectionState("currentSection"); + + }, function(err) { + + vm.createFolderError = err; + + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + }); + } } function showCreateFromSnippet() { diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html index fc9bf98c4f..7aae1f871a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html @@ -47,12 +47,12 @@
    + ng-submit="vm.createFolder(createFolderForm)" + val-form-manager> -
    -
    {{error.errorMsg}}
    -

    {{error.data.message}}

    +
    +
    {{vm.createFolderError.errorMsg}}
    +

    {{vm.createFolderError.data.message}}

    From 999de5ae1ddab5e429d26804f4b3e738d201ee1b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 6 Feb 2017 15:05:13 +0100 Subject: [PATCH 29/58] add client side logic for partial view macros folder creation --- .../partialviewmacros/create.controller.js | 37 ++++++++++++++++++- .../src/views/partialviewmacros/create.html | 10 ++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index 3b3fb0f9f5..46d2e1d648 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -1,14 +1,17 @@ (function () { "use strict"; - function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService) { + function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService) { var vm = this; var node = $scope.dialogOptions.currentNode; + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder"); vm.snippets = []; vm.showSnippets = false; vm.creatingFolder = false; + vm.createFolderError = ""; + vm.folderName = ""; vm.createPartialViewMacro = createPartialViewMacro; vm.showCreateFolder = showCreateFolder; @@ -39,8 +42,38 @@ vm.creatingFolder = true; } - function createFolder() { + function createFolder(form) { + if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { + codefileResource.createContainer("partialViewMacros", node.id, vm.folderName).then(function(path) { + + navigationService.hideMenu(); + + navigationService.syncTree({ + tree: "partialViewMacros", + path: path, + forceReload: true, + activate: true + }); + + formHelper.resetForm({ + scope: $scope + }); + + var section = appState.getSectionState("currentSection"); + + }, function(err) { + + vm.createFolderError = err; + + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + }); + } } function showCreateFromSnippet() { diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html index aa8796ae7a..0c5a74c4b0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html @@ -47,12 +47,12 @@
    + ng-submit="vm.createFolder(createFolderForm)" + val-form-manager> -
    -
    {{error.errorMsg}}
    -

    {{error.data.message}}

    +
    +
    {{vm.createFolderError.errorMsg}}
    +

    {{vm.createFolderError.data.message}}

    From c36000c4ddb50d52286718dba4559426231dec40 Mon Sep 17 00:00:00 2001 From: Emil Wangaa Date: Tue, 7 Feb 2017 10:55:38 +0100 Subject: [PATCH 30/58] Adds create container endpoint for creation folders for scripts, partialviews, partialviewmacros --- src/Umbraco.Core/Services/FileService.cs | 22 +++++++- src/Umbraco.Core/Services/IFileService.cs | 2 + .../src/common/resources/codefile.resource.js | 2 +- .../partialviewmacros/create.controller.js | 6 +- .../views/partialviews/create.controller.js | 6 +- .../src/views/scripts/create.controller.js | 6 +- src/Umbraco.Web/Editors/CodeFileController.cs | 56 ++++++++++++++++++- 7 files changed, 88 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs index 2105f7af2c..3b842e6875 100644 --- a/src/Umbraco.Core/Services/FileService.cs +++ b/src/Umbraco.Core/Services/FileService.cs @@ -667,7 +667,27 @@ namespace Umbraco.Core.Services .ToArray(); return empty.Union(files.Except(empty)); - } + } + + public void CreatePartialViewFolder(string folderPath) + { + var uow = _fileUowProvider.GetUnitOfWork(); + using (var repository = RepositoryFactory.CreatePartialViewRepository(uow)) + { + ((PartialViewRepository)repository).AddFolder(folderPath); + uow.Commit(); + } + } + + public void CreatePartialViewMacroFolder(string folderPath) + { + var uow = _fileUowProvider.GetUnitOfWork(); + using (var repository = RepositoryFactory.CreatePartialViewMacroRepository(uow)) + { + ((PartialViewMacroRepository)repository).AddFolder(folderPath); + uow.Commit(); + } + } public void DeletePartialViewFolder(string folderPath) { diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs index 453d199bfe..e8f1065219 100644 --- a/src/Umbraco.Core/Services/IFileService.cs +++ b/src/Umbraco.Core/Services/IFileService.cs @@ -11,6 +11,8 @@ namespace Umbraco.Core.Services public interface IFileService : IService { IEnumerable GetPartialViewSnippetNames(params string[] filterNames); + void CreatePartialViewFolder(string folderPath); + void CreatePartialViewMacroFolder(string folderPath); void DeletePartialViewFolder(string folderPath); void DeletePartialViewMacroFolder(string folderPath); IPartialView GetPartialView(string path); diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js index b6a56d336b..44454f21e3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js @@ -235,7 +235,7 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) { $http.post(umbRequestHelper.getApiUrl( "codeFileApiBaseUrl", "PostCreateContainer", - { type: type, parentId: parentId, name: name })), + { type: type, parentId: parentId, name: encodeURIComponent(name) })), 'Failed to create a folder under parent id ' + parentId); } diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index 46d2e1d648..6132ba3f89 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService) { + function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService, appState) { var vm = this; var node = $scope.dialogOptions.currentNode; @@ -45,13 +45,13 @@ function createFolder(form) { if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { - codefileResource.createContainer("partialViewMacros", node.id, vm.folderName).then(function(path) { + codefileResource.createContainer("partialViewMacros", node.id, vm.folderName).then(function (saved) { navigationService.hideMenu(); navigationService.syncTree({ tree: "partialViewMacros", - path: path, + path: saved.path, forceReload: true, activate: true }); diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js index 6fc2fff3a7..95d224b890 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService) { + function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService, appState) { var vm = this; var node = $scope.dialogOptions.currentNode; @@ -45,13 +45,13 @@ function createFolder(form) { if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { - codefileResource.createContainer("partialViews", node.id, vm.folderName).then(function(path) { + codefileResource.createContainer("partialViews", node.id, vm.folderName).then(function(saved) { navigationService.hideMenu(); navigationService.syncTree({ tree: "partialViews", - path: path, + path: saved.path, forceReload: true, activate: true }); diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js index 89ff9e6643..bb3aedeb4a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function ScriptsCreateController($scope, $location, navigationService, formHelper, codefileResource, localizationService) { + function ScriptsCreateController($scope, $location, navigationService, formHelper, codefileResource, localizationService, appState) { var vm = this; var node = $scope.dialogOptions.currentNode; @@ -29,13 +29,13 @@ if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { - codefileResource.createContainer("scripts", node.id, vm.folderName).then(function(path) { + codefileResource.createContainer("scripts", node.id, vm.folderName).then(function (saved) { navigationService.hideMenu(); navigationService.syncTree({ tree: "scripts", - path: path, + path: saved.path, forceReload: true, activate: true }); diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index bcb6630c0a..6775f84a61 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -56,6 +56,61 @@ namespace Umbraco.Web.Editors } } + /// + /// Used to create a container/folder in 'partialViews', 'partialViewMacros' or 'scripts' + /// + /// 'partialViews', 'partialViewMacros' or 'scripts' + /// The virtual path of the parent. + /// The name of the container/folder + /// + [HttpPost] + public CodeFileDisplay PostCreateContainer(string type, string parentId, string name) + { + if (string.IsNullOrWhiteSpace(type) || string.IsNullOrWhiteSpace(name)) + { + throw new HttpResponseException(HttpStatusCode.BadRequest); + } + + // if the parentId is root (-1) then we just need an empty string as we are + // creating the path below and we don't wan't -1 in the path + if (parentId == Core.Constants.System.Root.ToInvariantString()) + { + parentId = string.Empty; + } + + name = System.Web.HttpUtility.UrlDecode(name); + + if (parentId.IsNullOrWhiteSpace() == false) + { + parentId = System.Web.HttpUtility.UrlDecode(parentId); + name = parentId.EnsureEndsWith("/") + name; + } + + var virtualPath = string.Empty; + switch (type) + { + case Core.Constants.Trees.PartialViews: + virtualPath = NormalizeVirtualPath(name, SystemDirectories.PartialViews); + Services.FileService.CreatePartialViewFolder(virtualPath); + break; + case Core.Constants.Trees.PartialViewMacros: + virtualPath = NormalizeVirtualPath(name, SystemDirectories.MacroPartials); + Services.FileService.CreatePartialViewMacroFolder(virtualPath); + break; + case Core.Constants.Trees.Scripts: + virtualPath = NormalizeVirtualPath(name, SystemDirectories.Scripts); + Services.FileService.CreateScriptFolder(virtualPath); + break; + + } + + return new CodeFileDisplay + { + VirtualPath = virtualPath, + Path = Url.GetTreePathFromFilePath(virtualPath) + }; + } + /// /// Used to get a specific file from disk via the FileService /// @@ -70,7 +125,6 @@ namespace Umbraco.Web.Editors } virtualPath = System.Web.HttpUtility.UrlDecode(virtualPath); - switch (type) { From 857063ebd873bea4536bb4f410ebc370269206b5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 09:53:52 +0100 Subject: [PATCH 31/58] =?UTF-8?q?fixes:=20U4-9465=20Mini=20list=20view:=20?= =?UTF-8?q?don=E2=80=99t=20show=20expand=20arrow=20on=20list=20views=20in?= =?UTF-8?q?=20trees=20not=20supporting=20mini=20list=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/directives/components/tree/umbtree.directive.js | 5 +++-- .../directives/components/tree/umbtreeitem.directive.js | 7 +++---- .../src/views/common/overlays/treepicker/treepicker.html | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js index 75d0144982..7a74716ea1 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js @@ -21,7 +21,8 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat customtreeparams: '@', eventhandler: '=', enablecheckboxes: '@', - enablelistviewsearch: '@' + enablelistviewsearch: '@', + enablelistviewexpand: '@' }, compile: function(element, attrs) { @@ -35,7 +36,7 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat '' + '
    '; template += '
      ' + - '' + + '' + '
    ' + '' + ''; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js index 8d30e071a6..b32942791c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js @@ -27,6 +27,7 @@ angular.module("umbraco.directives") section: '@', eventhandler: '=', currentNode: '=', + enablelistviewexpand: '@', node: '=', tree: '=' }, @@ -74,10 +75,8 @@ angular.module("umbraco.directives") //toggle visibility of last 'ins' depending on children //visibility still ensure the space is "reserved", so both nodes with and without children are aligned. - - console.log(node); - if (node.hasChildren || node.metaData.isContainer) { + if (node.hasChildren || node.metaData.isContainer && scope.enablelistviewexpand === "true") { element.find("ins").last().css("visibility", "visible"); } else { @@ -230,7 +229,7 @@ angular.module("umbraco.directives") setupNodeDom(scope.node, scope.tree); - var template = '
    '; + var template = '
    '; var newElement = angular.element(template); $compile(newElement)(scope); element.append(newElement); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index a4b3c75982..4ecb6c1b9e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -30,6 +30,7 @@ customtreeparams="{{customTreeParams}}" eventhandler="dialogTreeEventHandler" enablelistviewsearch="true" + enablelistviewexpand="true" enablecheckboxes="{{multiPicker}}">
    From c060856782e221e907d493e2378c4c7e3e4cca7d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 11:09:09 +0100 Subject: [PATCH 32/58] fix breadcrumb for pickers with a startNode --- .../treepicker/treepicker.controller.js | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index bdcd942474..125384b57e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -492,19 +492,12 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", angular.forEach(miniListViewsHistory, function(historyItem, index){ if(parseInt(historyItem.node.id) === parseInt(ancestor.id)) { - // load the list view from history $scope.miniListViews = []; $scope.miniListViews.push(historyItem); - // remove from history - miniListViewsHistory.splice(index, miniListViewsHistory.length - index); - found = true; - // get ancestors - entityResource.getAncestors(historyItem.node.id, entityType) - .then(function (ancestors) { - $scope.breadcrumb = ancestors; - }); + getAncestors(historyItem.node); + found = true; } }); @@ -570,10 +563,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }); // get ancestors - entityResource.getAncestors(node.id, entityType) - .then(function (ancestors) { - $scope.breadcrumb = ancestors; - }); + getAncestors(node); } @@ -619,6 +609,30 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } + function getAncestors(node) { + entityResource.getAncestors(node.id, entityType) + .then(function (ancestors) { + + // if there is a start node remove all ancestors before that one + if(dialogOptions.startNodeId && dialogOptions.startNodeId !== -1) { + var found = false; + $scope.breadcrumb = []; + angular.forEach(ancestors, function(ancestor){ + if(parseInt(ancestor.id) === parseInt(dialogOptions.startNodeId)) { + found = true; + } + if(found) { + $scope.breadcrumb.push(ancestor); + } + }); + + } else { + $scope.breadcrumb = ancestors; + } + + }); + } + $scope.getMiniListViewAnimation = function() { if(goingForward) { return 'umb-mini-list-view--forward'; From 7bcb2b11f611402504e9ecd71af34c14368f2953 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 Feb 2017 14:43:59 +0100 Subject: [PATCH 33/58] Makes the (un)install summary accessible to events --- src/Umbraco.Core/Events/ImportPackageEventArgs.cs | 5 +++++ src/Umbraco.Core/Events/UninstallPackageEventArgs.cs | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs index 8596629731..6dd13f2433 100644 --- a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs +++ b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs @@ -22,5 +22,10 @@ namespace Umbraco.Core.Events { get { return _packageMetaData; } } + + public IEnumerable InstallationSummary + { + get { return EventObject; } + } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs b/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs index 1371942c2b..324867a8f7 100644 --- a/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs +++ b/src/Umbraco.Core/Events/UninstallPackageEventArgs.cs @@ -22,5 +22,10 @@ namespace Umbraco.Core.Events { get { return _packageMetaData; } } + + public IEnumerable UninstallationSummary + { + get { return EventObject; } + } } } \ No newline at end of file From 308ed3bba79d07f43e59393e06b15fe9e104cb8d Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 Feb 2017 14:44:48 +0100 Subject: [PATCH 34/58] Removed files that are not found on disk don't get updated to list their full path --- src/Umbraco.Web/Editors/PackageInstallController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 99e37b610c..2a08d3955f 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -222,11 +222,10 @@ namespace Umbraco.Web.Editors file = string.Format("/{0}", file); var filePath = IOHelper.MapPath(file); + removedFiles.Add(filePath); + if (File.Exists(filePath)) - { - removedFiles.Add(filePath); File.Delete(filePath); - } } pack.Data.Files.Remove(file); } From 7648c76f6ff904c4729e3e5f1f55f01c1f2fb74b Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 Feb 2017 14:45:07 +0100 Subject: [PATCH 35/58] List full path of each file installed --- src/Umbraco.Core/IO/IOHelper.cs | 20 ++++++++++++++++--- .../PackageInstance/InstalledPackage.cs | 12 +++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index 286acf0285..de27f13748 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -4,11 +4,11 @@ using System.Globalization; using System.Reflection; using System.IO; using System.Configuration; +using System.Linq; using System.Web; using System.Text.RegularExpressions; using System.Web.Hosting; using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; namespace Umbraco.Core.IO { @@ -351,7 +351,21 @@ namespace Umbraco.Core.IO writer.Write(contents); } } - - } + + } + + /// + /// Checks if a given path is a full path including drive letter + /// + /// + /// + // From: http://stackoverflow.com/a/35046453/5018 + internal static bool IsFullPath(this string path) + { + return string.IsNullOrWhiteSpace(path) == false + && path.IndexOfAny(Path.GetInvalidPathChars().ToArray()) == -1 + && Path.IsPathRooted(path) + && Path.GetPathRoot(path).Equals(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) == false; + } } } diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index a5ae2f5015..dc66592cff 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -145,6 +145,18 @@ namespace umbraco.cms.businesslogic.packager { var dataTypes = TryGetIntegerIds(Data.DataTypes).Select(dataTypeService.GetDataTypeDefinitionById).ToList(); var dictionaryItems = TryGetIntegerIds(Data.DictionaryItems).Select(localizationService.GetDictionaryItemById).ToList(); var languages = TryGetIntegerIds(Data.Languages).Select(localizationService.GetLanguageById).ToList(); + + for (var i = 0; i < Data.Files.Count; i++) + { + var filePath = Data.Files[i]; + if (filePath.IsFullPath()) + continue; + + filePath = filePath.TrimStart('~'); + if (filePath.StartsWith("/") == false) + filePath = string.Format("/{0}", filePath); + Data.Files[i] = IOHelper.MapPath(filePath); + } return new InstallationSummary { From 843796c9a4ebb131e39cf8b69dd84864b759da20 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 14:58:54 +0100 Subject: [PATCH 36/58] refactor move logic from tree controller into to mini-list-view component --- .../components/umbminilistview.directive.js | 203 ++++++++++++++++-- .../treepicker/treepicker.controller.js | 195 ++--------------- .../overlays/treepicker/treepicker.html | 43 +--- .../views/components/umb-mini-list-view.html | 122 ++++++----- 4 files changed, 278 insertions(+), 285 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index c45f77b44c..631004e218 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -1,33 +1,194 @@ -(function() { +(function () { 'use strict'; - function MiniListViewDirective() { + function MiniListViewDirective($q, contentResource, memberResource, mediaResource, entityResource) { function link(scope, el, attr, ctrl) { scope.search = ""; + scope.miniListViews = []; + scope.breadcrumb = []; - scope.openChild = function(event, child) { - if(scope.onOpenChild) { - scope.onOpenChild({"child": child}); - event.stopPropagation(); - } - }; + var miniListViewsHistory = []; + var goingForward = true; - scope.selectChild = function(child) { - if(scope.onSelectChild) { - scope.onSelectChild({"child": child}); - } - }; + function onInit() { + open(scope.node); + } - scope.searchMiniListView = function() { - if (scope.search !== null && scope.search !== undefined) { - if(scope.onSearch) { - scope.onSearch({"search": scope.search}); + function open(node) { + + goingForward = true; + + var miniListView = { + node: node, + loading: true, + pagination: { + pageSize: 10, + pageNumber: 1, + filter: '', + orderDirection: "Ascending", + orderBy: "SortOrder", + orderBySystemField: true } + }; + + // start loading animation on node + node.loading = true; + + getChildrenForMiniListView(miniListView) + .then(function (data) { + + // stop loading animation on node + node.loading = false; + + // clear and push mini list view in dom so we only render 1 view + scope.miniListViews = []; + scope.miniListViews.push(miniListView); + + // store in history so we quickly can navigate back + miniListViewsHistory.push(miniListView); + + }); + + // get ancestors + getAncestors(node); + + } + + function getChildrenForMiniListView(miniListView) { + + // setup promise + var deferred = $q.defer(); + + // start loading animation list view + miniListView.loading = true; + + // setup the correct resource depending on section + var resource = ""; + + if (scope.entityType === "Member") { + resource = memberResource.getPagedResults; + } else if (scope.entityType === "Media") { + resource = mediaResource.getChildren; + } else { + resource = contentResource.getChildren; + } + + resource(miniListView.node.id, miniListView.pagination) + .then(function (data) { + + // update children + miniListView.children = data.items; + + // update pagination + miniListView.pagination.totalItems = data.totalItems; + miniListView.pagination.totalPages = data.totalPages; + + // stop load indicator + miniListView.loading = false; + + deferred.resolve(data); + }); + + return deferred.promise; + + } + + scope.openNode = function(event, node) { + open(node); + event.stopPropagation(); + }; + + scope.selectNode = function(node) { + if(scope.onSelect) { + scope.onSelect({'node': node}); } }; + /* Pagination */ + scope.goToPage = function(pageNumber, miniListView) { + // set new page number + miniListView.pagination.pageNumber = pageNumber; + // get children + getChildrenForMiniListView(miniListView); + }; + + /* Breadcrumb */ + scope.clickBreadcrumb = function(ancestor) { + + var found = false; + goingForward = false; + + angular.forEach(miniListViewsHistory, function(historyItem, index){ + if(Number(historyItem.node.id) === Number(ancestor.id)) { + // load the list view from history + scope.miniListViews = []; + scope.miniListViews.push(historyItem); + // get ancestors + getAncestors(historyItem.node); + found = true; + } + }); + + if(!found) { + // if we can't find the view in the history + miniListViewsHistory = []; + scope.miniListViews = []; + } + + }; + + function getAncestors(node) { + entityResource.getAncestors(node.id, scope.entityType) + .then(function (ancestors) { + + // if there is a start node remove all ancestors before that one + if(scope.startNodeId && scope.startNodeId !== -1) { + var found = false; + scope.breadcrumb = []; + angular.forEach(ancestors, function(ancestor){ + if(Number(ancestor.id) === Number(scope.startNodeId)) { + found = true; + } + if(found) { + scope.breadcrumb.push(ancestor); + } + }); + + } else { + scope.breadcrumb = ancestors; + } + + }); + } + + /* Search */ + scope.searchMiniListView = function(search, miniListView) { + // set search value + miniListView.pagination.filter = search; + // start loading animation list view + miniListView.loading = true; + searchMiniListView(miniListView); + }; + + var searchMiniListView = _.debounce(function (miniListView) { + scope.$apply(function () { + getChildrenForMiniListView(miniListView); + }); + }, 500); + + /* Animation */ + scope.getMiniListViewAnimation = function() { + if(goingForward) { + return 'umb-mini-list-view--forward'; + } else { + return 'umb-mini-list-view--backwards'; + } + }; + + onInit(); + } var directive = { @@ -36,11 +197,9 @@ templateUrl: 'views/components/umb-mini-list-view.html', scope: { node: "=", - children: "=", - onSelectChild: "&", - onOpenChild: "&", - onSearch: "&", - loadingChildren: "=" + entityType: "@", + startNodeId: "=", + onSelect: "&" }, link: link }; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 125384b57e..baf775d4d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -22,17 +22,17 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.init = function(contentType) { if(contentType === "content") { - entityType = "Document"; + $scope.entityType = "Document"; if(!$scope.model.title) { $scope.model.title = localizationService.localize("defaultdialogs_selectContent"); } } else if(contentType === "member") { - entityType = "Member"; + $scope.entityType = "Member"; if(!$scope.model.title) { $scope.model.title = localizationService.localize("defaultdialogs_selectMember"); } } else if(contentType === "media") { - entityType = "Media"; + $scope.entityType = "Media"; if(!$scope.model.title) { $scope.model.title = localizationService.localize("defaultdialogs_selectMedia"); } @@ -49,7 +49,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", }); // Allow the entity type to be passed in but defaults to Document for backwards compatibility. - var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document"; + $scope.entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document"; //min / max values @@ -61,10 +61,10 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } if (dialogOptions.section === "member") { - entityType = "Member"; + $scope.entityType = "Member"; } else if (dialogOptions.section === "media") { - entityType = "Media"; + $scope.entityType = "Media"; } // Search and listviews is only working for content, media and member section so we will remove it from everything else @@ -73,7 +73,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", //if a alternative startnode is used, we need to check if it is a container if (dialogOptions.startNodeId && dialogOptions.startNodeId !== -1) { - entityResource.getById(dialogOptions.startNodeId, entityType).then(function (node) { + entityResource.getById(dialogOptions.startNodeId, $scope.entityType).then(function (node) { if (node.metaData.IsContainer) { openMiniListView(node); } @@ -193,7 +193,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", multiSelectItem(entity); } else { //otherwise we have to get it from the server - entityResource.getById(id, entityType).then(function (ent) { + entityResource.getById(id, $scope.entityType).then(function (ent) { multiSelectItem(ent); }); } @@ -218,7 +218,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", multiSelectItem(entity); } else { //otherwise we have to get it from the server - entityResource.getById(id, entityType).then(function (ent) { + entityResource.getById(id, $scope.entityType).then(function (ent) { multiSelectItem(ent); }); } @@ -235,7 +235,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.model.submit($scope.model); } else { //otherwise we have to get it from the server - entityResource.getById(id, entityType).then(function (ent) { + entityResource.getById(id, $scope.entityType).then(function (ent) { $scope.model.selection.push(ent); $scope.model.submit($scope.model); }); @@ -316,7 +316,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", } $scope.multiSubmit = function (result) { - entityResource.getByIds(result, entityType).then(function (ents) { + entityResource.getByIds(result, $scope.entityType).then(function (ents) { $scope.submit(ents); }); }; @@ -466,179 +466,14 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler); }); - /* --- Mini List View --- */ - $scope.miniListViews = []; - $scope.breadcrumb = []; - var miniListViewsHistory = []; - var goingForward = true; - - $scope.goToPage = function(pageNumber, miniListView) { - // set new page number - miniListView.pagination.pageNumber = pageNumber; - // get children - getChildrenForMiniListView(miniListView); - }; - - $scope.selectListViewItem = function(item) { - select(item.name, item.id); + $scope.selectListViewNode = function(node) { + select(node.name, node.id); //toggle checked state - item.selected = item.selected === true ? false : true; + node.selected = node.selected === true ? false : true; }; - $scope.clickBreadcrumb = function(ancestor) { - - var found = false; - goingForward = false; - - angular.forEach(miniListViewsHistory, function(historyItem, index){ - if(parseInt(historyItem.node.id) === parseInt(ancestor.id)) { - // load the list view from history - $scope.miniListViews = []; - $scope.miniListViews.push(historyItem); - // get ancestors - getAncestors(historyItem.node); - found = true; - } - }); - - if(!found) { - // if we can't find the view in the history - miniListViewsHistory = []; - $scope.miniListViews = []; - } - - }; - - $scope.searchMiniListView = function(search, miniListView) { - // set search value - miniListView.pagination.filter = search; - // start loading animation list view - miniListView.loading = true; - searchMiniListView(miniListView); - }; - - $scope.test = function(node) { - openMiniListView(node); - }; - - var searchMiniListView = _.debounce(function (miniListView) { - $scope.$apply(function () { - getChildrenForMiniListView(miniListView); - }); - }, 500); - function openMiniListView(node) { - - goingForward = true; - - var miniListView = { - node: node, - loading: true, - pagination: { - pageSize: 10, - pageNumber: 1, - filter: '', - orderDirection: "Ascending", - orderBy: "SortOrder", - orderBySystemField: true - } - }; - - // start loading animation on node - node.loading = true; - - getChildrenForMiniListView(miniListView) - .then(function(data){ - - // stop loading animation on node - node.loading = false; - - // clear and push mini list view in dom so we only render 1 view - $scope.miniListViews = []; - $scope.miniListViews.push(miniListView); - - // store in history so we quickly can navigate back - miniListViewsHistory.push(miniListView); - - }); - - // get ancestors - getAncestors(node); - - } - - function getChildrenForMiniListView(miniListView) { - - // setup promise - var deferred = $q.defer(); - - // start loading animation list view - miniListView.loading = true; - - // setup the correct resource depending on section - var resource = ""; - - if (entityType === "Document") { - resource = contentResource.getChildren; - } else if (entityType === "Member") { - resource = memberResource.getPagedResults; - } else if (entityType === "Media") { - resource = mediaResource.getChildren; - } - - resource(miniListView.node.id, miniListView.pagination) - .then(function (data) { - - console.log("data, data, data", data); - - // update children - miniListView.children = data.items; - - // update pagination - miniListView.pagination.totalItems = data.totalItems; - miniListView.pagination.totalPages = data.totalPages; - - // stop load indicator - miniListView.loading = false; - - deferred.resolve(data); - - }); - - return deferred.promise; - - } - - function getAncestors(node) { - entityResource.getAncestors(node.id, entityType) - .then(function (ancestors) { - - // if there is a start node remove all ancestors before that one - if(dialogOptions.startNodeId && dialogOptions.startNodeId !== -1) { - var found = false; - $scope.breadcrumb = []; - angular.forEach(ancestors, function(ancestor){ - if(parseInt(ancestor.id) === parseInt(dialogOptions.startNodeId)) { - found = true; - } - if(found) { - $scope.breadcrumb.push(ancestor); - } - }); - - } else { - $scope.breadcrumb = ancestors; - } - - }); - } - - $scope.getMiniListViewAnimation = function() { - if(goingForward) { - return 'umb-mini-list-view--forward'; - } else { - return 'umb-mini-list-view--backwards'; - } + $scope.miniListView = node; } }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index 4ecb6c1b9e..f89ff9faf8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -1,6 +1,6 @@
    -
    +
    - -
    -
    - -

    {{ miniListView.node.name }}

    -
    - - - - - - - -
    - - -
    - -
    + +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index db3c6b1f3e..8bb584807d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -1,65 +1,91 @@
    -
    +
    - -
    -
    - -
    - -
    - - -
    - -
    -
    +
    + +

    {{ miniListView.node.name }}

    - -
    + + - -
    - -
    +
    - -
    -
    -
    -   - - + +
    +
    + +
    +
    +
    + + +
    +
    -
    {{ child.name }}
    - -
    - - + +
    + + +
    + +
    + + +
    +
    +
    +   + + +
    +
    +
    {{ child.name }}
    +
    + + +
    + + +
    + + +
    + +
    +
    - -
    - -
    +
    +
    + +
    From 548f9fd01fcc278becb520e67eef7a3dc5189d59 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 15:02:03 +0100 Subject: [PATCH 37/58] open mini list view before children are loaded --- .../components/umbminilistview.directive.js | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 631004e218..8e5fa8cee2 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - function MiniListViewDirective($q, contentResource, memberResource, mediaResource, entityResource) { + function MiniListViewDirective(contentResource, memberResource, mediaResource, entityResource) { function link(scope, el, attr, ctrl) { @@ -33,23 +33,15 @@ } }; - // start loading animation on node - node.loading = true; + // clear and push mini list view in dom so we only render 1 view + scope.miniListViews = []; + scope.miniListViews.push(miniListView); - getChildrenForMiniListView(miniListView) - .then(function (data) { + // store in history so we quickly can navigate back + miniListViewsHistory.push(miniListView); - // stop loading animation on node - node.loading = false; - - // clear and push mini list view in dom so we only render 1 view - scope.miniListViews = []; - scope.miniListViews.push(miniListView); - - // store in history so we quickly can navigate back - miniListViewsHistory.push(miniListView); - - }); + // get children + getChildrenForMiniListView(miniListView); // get ancestors getAncestors(node); @@ -58,9 +50,6 @@ function getChildrenForMiniListView(miniListView) { - // setup promise - var deferred = $q.defer(); - // start loading animation list view miniListView.loading = true; @@ -77,22 +66,14 @@ resource(miniListView.node.id, miniListView.pagination) .then(function (data) { - // update children miniListView.children = data.items; - // update pagination miniListView.pagination.totalItems = data.totalItems; miniListView.pagination.totalPages = data.totalPages; - // stop load indicator miniListView.loading = false; - - deferred.resolve(data); }); - - return deferred.promise; - } scope.openNode = function(event, node) { From e4802b592f14065a0442c0185e58bd8f620cab73 Mon Sep 17 00:00:00 2001 From: Emil Wangaa Date: Wed, 8 Feb 2017 15:43:31 +0100 Subject: [PATCH 38/58] Centralized the tree menu logic for partialviews, partialviewmacros and scripts to the FileSystemTreeController and implemented logic to match what we do for Document Types --- .../Trees/FileSystemTreeController.cs | 69 +++++++++++++++++-- .../Trees/PartialViewMacrosTreeController.cs | 42 ++--------- .../Trees/PartialViewsTreeController.cs | 34 --------- src/Umbraco.Web/Trees/ScriptTreeController.cs | 37 +--------- 4 files changed, 68 insertions(+), 114 deletions(-) diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs index 61ee8c4ff9..21981ca3c0 100644 --- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs @@ -1,10 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Net.Http.Formatting; +using umbraco.BusinessLogic.Actions; +using Umbraco.Core; using Umbraco.Core.IO; +using Umbraco.Core.Services; using Umbraco.Web.Models.Trees; namespace Umbraco.Web.Trees @@ -27,7 +27,7 @@ namespace Umbraco.Web.Trees /// protected virtual void OnRenderFolderNode(ref TreeNode treeNode) { } - protected override Models.Trees.TreeNodeCollection GetTreeNodes(string id, System.Net.Http.Formatting.FormDataCollection queryStrings) + protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) { string orgPath = ""; string path = ""; @@ -90,6 +90,63 @@ namespace Umbraco.Web.Trees } return nodes; - } + } + + protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) + { + var menu = new MenuItemCollection(); + + //if root node no need to visit the filesystem so lets just create the menu and return it + if (id == Constants.System.Root.ToInvariantString()) + { + //set the default to create + menu.DefaultMenuAlias = ActionNew.Instance.Alias; + //create action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); + //refresh action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); + + return menu; + } + + string path; + if (string.IsNullOrEmpty(id) == false) + { + var orgPath = System.Web.HttpUtility.UrlDecode(id); + path = IOHelper.MapPath(FilePath + "/" + orgPath); + } + else + { + path = IOHelper.MapPath(FilePath); + } + + var dirInfo = new DirectoryInfo(path); + //check if it's a directory + if (dirInfo.Attributes == FileAttributes.Directory) + { + //set the default to create + menu.DefaultMenuAlias = ActionNew.Instance.Alias; + //create action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); + //refresh action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); + + var hasChildren = dirInfo.GetFiles().Length > 0 || dirInfo.GetDirectories().Length > 0; + //We can only delete folders if it doesn't have any children (folders or files) + if (hasChildren == false) + { + //delete action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); + } + } + //if it's not a directory then we only allow to delete the item + else + { + //delete action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); + } + + return menu; + } } } diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs index 61d9c17cef..9643823e7b 100644 --- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs +++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs @@ -1,16 +1,13 @@ using Umbraco.Core; using Umbraco.Core.IO; -using umbraco.BusinessLogic.Actions; using Umbraco.Web.Models.Trees; -using System.Net.Http.Formatting; -using Umbraco.Core.Services; namespace Umbraco.Web.Trees { - /// - /// Tree for displaying partial view macros in the developer app - /// - [Tree(Constants.Applications.Developer, "partialViewMacros", "Partial View Macro Files", sortOrder: 6)] + /// + /// Tree for displaying partial view macros in the developer app + /// + [Tree(Constants.Applications.Developer, "partialViewMacros", "Partial View Macro Files", sortOrder: 6)] public class PartialViewMacrosTreeController : FileSystemTreeController { protected override string FilePath @@ -28,37 +25,6 @@ namespace Umbraco.Web.Trees get { return "icon-article"; } } - protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) - { - var menu = new MenuItemCollection(); - - if (id == Constants.System.Root.ToInvariantString()) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - - return menu; - } - - if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - } - - // TODO: Wire up new delete dialog - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); - return menu; - } - protected override void OnRenderFileNode(ref TreeNode treeNode) { base.OnRenderFileNode(ref treeNode); diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs index 96da9a2e33..07a0a557af 100644 --- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs +++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs @@ -1,9 +1,6 @@ using Umbraco.Core; using Umbraco.Core.IO; -using umbraco.BusinessLogic.Actions; using Umbraco.Web.Models.Trees; -using System.Net.Http.Formatting; -using Umbraco.Core.Services; namespace Umbraco.Web.Trees { @@ -27,37 +24,6 @@ namespace Umbraco.Web.Trees get { return "icon-article"; } } - protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) - { - var menu = new MenuItemCollection(); - - if (id == Constants.System.Root.ToInvariantString()) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - - return menu; - } - - if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - } - - // TODO: Wire up new delete dialog - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); - return menu; - } - protected override void OnRenderFileNode(ref TreeNode treeNode) { base.OnRenderFileNode(ref treeNode); diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs index c7d4e728aa..f491989228 100644 --- a/src/Umbraco.Web/Trees/ScriptTreeController.cs +++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs @@ -1,10 +1,6 @@ -using System.Linq; -using Umbraco.Core; +using Umbraco.Core; using Umbraco.Core.IO; -using umbraco.BusinessLogic.Actions; using Umbraco.Web.Models.Trees; -using System.Net.Http.Formatting; -using Umbraco.Core.Services; namespace Umbraco.Web.Trees { @@ -25,37 +21,6 @@ namespace Umbraco.Web.Trees get { return "icon-script"; } } - protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings) - { - var menu = new MenuItemCollection(); - - if (id == Constants.System.Root.ToInvariantString()) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - - return menu; - } - - if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false) - { - //set the default to create - menu.DefaultMenuAlias = ActionNew.Instance.Alias; - //create action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - } - - // TODO: Wire up new delete dialog - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); - return menu; - } - protected override void OnRenderFolderNode(ref TreeNode treeNode) { //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. From a31cfb86f8bf958fd2a074a53edd6034e9fd0fb9 Mon Sep 17 00:00:00 2001 From: Emil Wangaa Date: Wed, 8 Feb 2017 15:57:53 +0100 Subject: [PATCH 39/58] Moved reload to be last menu option and added a separator for delete option to keep consistency --- src/Umbraco.Web/Trees/FileSystemTreeController.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs index 21981ca3c0..88f322971d 100644 --- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs @@ -128,16 +128,17 @@ namespace Umbraco.Web.Trees menu.DefaultMenuAlias = ActionNew.Instance.Alias; //create action menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - //refresh action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); - + var hasChildren = dirInfo.GetFiles().Length > 0 || dirInfo.GetDirectories().Length > 0; //We can only delete folders if it doesn't have any children (folders or files) if (hasChildren == false) { //delete action - menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)), true); } + + //refresh action + menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true); } //if it's not a directory then we only allow to delete the item else From bb31eb7c35efe293d5e05926875c0f9a8877f759 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 Feb 2017 16:19:47 +0100 Subject: [PATCH 40/58] Emit only relative paths for files in a package --- src/Umbraco.Core/IO/IOHelper.cs | 31 ++++++++++++++ .../Editors/PackageInstallController.cs | 40 +++++++++---------- .../PackageInstance/InstalledPackage.cs | 8 +--- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index de27f13748..5ce851bdb4 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -367,5 +367,36 @@ namespace Umbraco.Core.IO && Path.IsPathRooted(path) && Path.GetPathRoot(path).Equals(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) == false; } + + /// + /// Get properly formatted relative path from an existing absolute or relative path + /// + /// + /// + internal static string GetRelativePath(this string path) + { + if (path.IsFullPath()) + { + var rootDirectory = GetRootDirectorySafe(); + var relativePath = path.ToLowerInvariant().Replace(rootDirectory.ToLowerInvariant(), string.Empty); + path = relativePath; + } + + return path.EnsurePathIsPrefixed(); + } + + /// + /// Ensures that a path has `~/` as prefix + /// + /// + /// + internal static string EnsurePathIsPrefixed(this string path) + { + if (path.StartsWith("/") == false && path.StartsWith("\\") == false) + path = string.Format("/{0}", path); + if (path.StartsWith("~") == false) + path = string.Format("~{0}", path); + return path; + } } } diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 2a08d3955f..f3b990ca41 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -100,8 +100,6 @@ namespace Umbraco.Web.Editors if (found != null) { removedTemplates.Add(found); - // add the actual file here, since deleting the template cause a file delete - removedFiles.Add(found.VirtualPath); ApplicationContext.Services.FileService.DeleteTemplate(found.Alias, Security.GetUserId()); } pack.Data.Templates.Remove(nId.ToString()); @@ -117,7 +115,7 @@ namespace Umbraco.Web.Editors { removedMacros.Add(macro); Services.MacroService.Delete(macro); - } + } pack.Data.Macros.Remove(nId.ToString()); } @@ -140,8 +138,8 @@ namespace Umbraco.Web.Editors if (contentTypes.Any()) { var orderedTypes = from contentType in contentTypes - orderby contentType.ParentId descending, contentType.Id descending - select contentType; + orderby contentType.ParentId descending, contentType.Id descending + select contentType; foreach (var contentType in orderedTypes) { removedContentTypes.Add(contentType); @@ -159,7 +157,7 @@ namespace Umbraco.Web.Editors { removedDictionaryItems.Add(di); Services.LocalizationService.Delete(di); - } + } pack.Data.DictionaryItems.Remove(nId.ToString()); } @@ -173,7 +171,7 @@ namespace Umbraco.Web.Editors { removedDataTypes.Add(dtd); Services.DataTypeService.Delete(dtd); - } + } pack.Data.DataTypes.Remove(nId.ToString()); } @@ -214,15 +212,15 @@ namespace Umbraco.Web.Editors //Remove files foreach (var item in pack.Data.Files.ToArray()) { + removedFiles.Add(item.GetRelativePath()); + //here we need to try to find the file in question as most packages does not support the tilde char var file = IOHelper.FindFile(item); if (file != null) { if (file.StartsWith("/") == false) file = string.Format("/{0}", file); - var filePath = IOHelper.MapPath(file); - removedFiles.Add(filePath); if (File.Exists(filePath)) File.Delete(filePath); @@ -252,7 +250,7 @@ namespace Umbraco.Web.Editors if (refreshCache) { library.RefreshContent(); - } + } TreeDefinitionCollection.Instance.ReRegisterTrees(); global::umbraco.BusinessLogic.Actions.Action.ReRegisterActionsAndHandlers(); } @@ -272,8 +270,8 @@ namespace Umbraco.Web.Editors { Version pckVersion; return Version.TryParse(pck.Data.Version, out pckVersion) - ? new {package = pck, version = pckVersion} - : new {package = pck, version = new Version(0, 0, 0)}; + ? new { package = pck, version = pckVersion } + : new { package = pck, version = new Version(0, 0, 0) }; }) .Select(grouping => { @@ -344,7 +342,7 @@ namespace Umbraco.Web.Editors model.UmbracoVersion = ins.RequirementsType == RequirementsType.Strict ? string.Format("{0}.{1}.{2}", ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch) : string.Empty; - + //now we need to check for version comparison model.IsCompatible = true; if (ins.RequirementsType == RequirementsType.Strict) @@ -424,7 +422,7 @@ namespace Umbraco.Web.Editors { //TODO: Currently it has to be here, it's not ideal but that's the way it is right now var packageTempDir = IOHelper.MapPath(SystemDirectories.Data); - + //ensure it's there Directory.CreateDirectory(packageTempDir); @@ -440,14 +438,14 @@ namespace Umbraco.Web.Editors PopulateFromPackageData(model); var validate = ValidateInstalledInternal(model.Name, model.Version); - + if (validate == false) { //this package is already installed throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse( - Services.TextService.Localize("packager/packageAlreadyInstalled"))); + Services.TextService.Localize("packager/packageAlreadyInstalled"))); } - + } else { @@ -456,7 +454,7 @@ namespace Umbraco.Web.Editors Services.TextService.Localize("media/disallowedFileType"), SpeechBubbleIcon.Warning)); } - + } return model; @@ -478,7 +476,7 @@ namespace Umbraco.Web.Editors //our repo guid using (var our = Repository.getByGuid("65194810-1f85-11dd-bd0b-0800200c9a66")) { - path = our.fetch(packageGuid, Security.CurrentUser.Id); + path = our.fetch(packageGuid, Security.CurrentUser.Id); } } @@ -522,12 +520,12 @@ namespace Umbraco.Web.Editors if (UmbracoVersion.Current < packageMinVersion) { throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse( - Services.TextService.Localize("packager/targetVersionMismatch", new[] {packageMinVersion.ToString()}))); + Services.TextService.Localize("packager/targetVersionMismatch", new[] { packageMinVersion.ToString() }))); } } model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempPath); - model.Id = ins.CreateManifest( IOHelper.MapPath(model.TemporaryDirectoryPath), model.PackageGuid.ToString(), model.RepositoryGuid.ToString()); + model.Id = ins.CreateManifest(IOHelper.MapPath(model.TemporaryDirectoryPath), model.PackageGuid.ToString(), model.RepositoryGuid.ToString()); return model; } diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index dc66592cff..172a9d6443 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -149,13 +149,7 @@ namespace umbraco.cms.businesslogic.packager { for (var i = 0; i < Data.Files.Count; i++) { var filePath = Data.Files[i]; - if (filePath.IsFullPath()) - continue; - - filePath = filePath.TrimStart('~'); - if (filePath.StartsWith("/") == false) - filePath = string.Format("/{0}", filePath); - Data.Files[i] = IOHelper.MapPath(filePath); + Data.Files[i] = filePath.GetRelativePath(); } return new InstallationSummary From 2785eaeda5b4f9aa7f94e25c41cad3d0f151790f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 20:22:54 +0100 Subject: [PATCH 41/58] only show unpublished state for content --- .../src/views/components/umb-mini-list-view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 8bb584807d..b08bd13952 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -54,14 +54,14 @@ ng-repeat="child in miniListView.children" ng-click="selectNode(child)" ng-class="{'-selected':child.selected}"> -
    +
     
    -
    {{ child.name }}
    +
    {{ child.name }}
    From f13427f5fb7350ea0fac72b60b490b57fda48216 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 22:49:16 +0100 Subject: [PATCH 42/58] fixes to breadcrumb --- .../components/umbminilistview.directive.js | 59 ++++++++++--------- .../less/components/umb-mini-list-view.less | 9 ++- .../treepicker/treepicker.controller.js | 4 ++ .../overlays/treepicker/treepicker.html | 3 +- .../views/components/umb-mini-list-view.html | 22 ++++--- 5 files changed, 59 insertions(+), 38 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 8e5fa8cee2..1ef7452848 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - function MiniListViewDirective(contentResource, memberResource, mediaResource, entityResource) { + function MiniListViewDirective(contentResource, memberResource, mediaResource) { function link(scope, el, attr, ctrl) { @@ -43,8 +43,7 @@ // get children getChildrenForMiniListView(miniListView); - // get ancestors - getAncestors(node); + makeBreadcrumb(); } @@ -102,12 +101,15 @@ goingForward = false; angular.forEach(miniListViewsHistory, function(historyItem, index){ - if(Number(historyItem.node.id) === Number(ancestor.id)) { + // We need to make sure we can compare the two id's. + // Some id's are numbers (1) and others are string numbers. + // Members have string ids like "all-members". + if(historyItem.node.id.toString() === ancestor.id.toString()) { // load the list view from history scope.miniListViews = []; scope.miniListViews.push(historyItem); - // get ancestors - getAncestors(historyItem.node); + // clean up history - remove all children after + miniListViewsHistory.splice(index + 1, miniListViewsHistory.length); found = true; } }); @@ -118,30 +120,32 @@ scope.miniListViews = []; } + makeBreadcrumb(); + }; - function getAncestors(node) { - entityResource.getAncestors(node.id, scope.entityType) - .then(function (ancestors) { + scope.showBackButton = function() { + // don't show the back button if the start node is a list view + if(scope.node.metaData && scope.node.metaData.IsContainer || scope.node.isContainer) { + return false; + } else { + return true; + } + }; - // if there is a start node remove all ancestors before that one - if(scope.startNodeId && scope.startNodeId !== -1) { - var found = false; - scope.breadcrumb = []; - angular.forEach(ancestors, function(ancestor){ - if(Number(ancestor.id) === Number(scope.startNodeId)) { - found = true; - } - if(found) { - scope.breadcrumb.push(ancestor); - } - }); + scope.exitMiniListView = function() { + miniListViewsHistory = []; + scope.miniListViews = []; + if(scope.onClose) { + scope.onClose(); + } + }; - } else { - scope.breadcrumb = ancestors; - } - - }); + function makeBreadcrumb() { + scope.breadcrumb = []; + angular.forEach(miniListViewsHistory, function(historyItem){ + scope.breadcrumb.push(historyItem.node); + }); } /* Search */ @@ -180,7 +184,8 @@ node: "=", entityType: "@", startNodeId: "=", - onSelect: "&" + onSelect: "&", + onClose: "&" }, link: link }; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less index 92871abd34..c32aee2de1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -14,10 +14,13 @@ } .umb-mini-list-view__back { - font-size: 12px; + font-size: 11px; margin-right: 5px; - color: @grayMed; - display: block; + color: @gray; +} + +.umb-mini-list-view__back-text { + text-decoration: underline; } .umb-mini-list-view__back:hover { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index baf775d4d9..1caff3ab31 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -472,6 +472,10 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", node.selected = node.selected === true ? false : true; }; + $scope.closeMiniListView = function() { + $scope.miniListView = undefined; + }; + function openMiniListView(node) { $scope.miniListView = node; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index f89ff9faf8..c9785ed9e1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -42,7 +42,8 @@ node="miniListView" entity-type="{{entityType}}" start-node-id="model.startNodeId" - on-select="selectListViewNode(node)"> + on-select="selectListViewNode(node)" + on-close="closeMiniListView()">
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index b08bd13952..27c33ee9a3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -7,13 +7,21 @@

    {{ miniListView.node.name }}

    - - +
    + + + + Back / + + + + + +
    From 5f22c81994e10238c608ea57b6775f47f00d305c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 23:37:33 +0100 Subject: [PATCH 43/58] =?UTF-8?q?fixes:=20U4-9467=20Mini=20list=20view:=20?= =?UTF-8?q?don=E2=80=99t=20animate=20list=20view=20if=20it=20is=20a=20star?= =?UTF-8?q?t=20node?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directives/components/umbminilistview.directive.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 1ef7452848..717caf15ed 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -11,6 +11,7 @@ var miniListViewsHistory = []; var goingForward = true; + var skipAnimation = true; function onInit() { open(scope.node); @@ -165,6 +166,13 @@ /* Animation */ scope.getMiniListViewAnimation = function() { + + // disable the first "slide-in-animation"" if the start node is a list view + if(scope.node.metaData && scope.node.metaData.IsContainer && skipAnimation || scope.node.isContainer && skipAnimation) { + skipAnimation = false; + return; + } + if(goingForward) { return 'umb-mini-list-view--forward'; } else { From 49c2ae367313f07c969c678ad64f007fc665a4ef Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Feb 2017 23:37:48 +0100 Subject: [PATCH 44/58] cleanup --- .../directives/components/umbminilistview.directive.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 717caf15ed..1a04eeff65 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -103,7 +103,7 @@ angular.forEach(miniListViewsHistory, function(historyItem, index){ // We need to make sure we can compare the two id's. - // Some id's are numbers (1) and others are string numbers. + // Some id's are integers and others are strings. // Members have string ids like "all-members". if(historyItem.node.id.toString() === ancestor.id.toString()) { // load the list view from history @@ -116,11 +116,11 @@ }); if(!found) { - // if we can't find the view in the history - miniListViewsHistory = []; - scope.miniListViews = []; + // if we can't find the view in the history - close the list view + scope.exitMiniListView(); } + // update the breadcrumb makeBreadcrumb(); }; From 1de52482e37c1a832b2c4a6a998b50c8065993e5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 9 Feb 2017 09:23:30 +0100 Subject: [PATCH 45/58] fix back arrow alignment --- .../src/less/components/umb-mini-list-view.less | 9 +++++++++ .../src/views/components/umb-mini-list-view.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less index c32aee2de1..1804b45260 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less @@ -17,10 +17,19 @@ font-size: 11px; margin-right: 5px; color: @gray; + display: flex; + align-items: center; +} + +.umb-mini-list-view__back-icon { + margin-right: 4px; + height: 11px; + line-height: 11px; } .umb-mini-list-view__back-text { text-decoration: underline; + margin-right: 5px; } .umb-mini-list-view__back:hover { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index 27c33ee9a3..97884a6d9e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -10,7 +10,7 @@
    - + Back / From 1901fbb6edd538236e2ee3bda2a368464130bcda Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 9 Feb 2017 10:42:15 +0100 Subject: [PATCH 46/58] add markup for member picker and content picker --- .../overlays/contentpicker/contentpicker.html | 70 +++++++++++-------- .../overlays/memberpicker/memberpicker.html | 69 ++++++++++-------- 2 files changed, 83 insertions(+), 56 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html index c22b539b38..43eab532d4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html @@ -1,34 +1,48 @@
    -
    - - +
    + +
    + + +
    + + + + +
    + + +
    +
    - - - -
    - - -
    + +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html index e4a8d36263..00475dddfe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html @@ -1,34 +1,47 @@
    -
    - - -
    +
    - - +
    + + +
    -
    - - -
    + + + +
    + + +
    +
    + + +
    From 91157caf0e6773c7eb7b3dba54b93b176c9489f1 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 10 Feb 2017 14:23:46 +1100 Subject: [PATCH 47/58] U4-8835 cmsMember.LoginName needs a DB index --- src/Umbraco.Core/Models/Rdbms/MemberDto.cs | 1 + src/Umbraco.Core/Umbraco.Core.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Umbraco.Core/Models/Rdbms/MemberDto.cs b/src/Umbraco.Core/Models/Rdbms/MemberDto.cs index e5f7b3f17c..cbe9f909f8 100644 --- a/src/Umbraco.Core/Models/Rdbms/MemberDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/MemberDto.cs @@ -22,6 +22,7 @@ namespace Umbraco.Core.Models.Rdbms [Column("LoginName")] [Length(1000)] [Constraint(Default = "''")] + [Index(IndexTypes.NonClustered, Name = "IX_cmsMember_LoginName")] public string LoginName { get; set; } [Column("Password")] diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 94267cf21f..1b15234fd1 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -479,6 +479,7 @@ + From 5aed6334c4f68e31df357028d8937b905223dede Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 10 Feb 2017 14:24:33 +1100 Subject: [PATCH 48/58] missing file --- .../AddIndexToCmsMemberLoginName.cs | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs new file mode 100644 index 0000000000..beff4b3210 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToCmsMemberLoginName.cs @@ -0,0 +1,42 @@ +using System.Linq; +using Umbraco.Core.Logging; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero +{ + [Migration("7.6.0", 0, Constants.System.UmbracoMigrationName)] + public class AddIndexToCmsMemberLoginName : MigrationBase + { + public AddIndexToCmsMemberLoginName(ISqlSyntaxProvider sqlSyntax, ILogger logger) + : base(sqlSyntax, logger) + { } + + public override void Up() + { + var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database) + .Select(x => new DbIndexDefinition() + { + TableName = x.Item1, + IndexName = x.Item2, + ColumnName = x.Item3, + IsUnique = x.Item4 + }).ToArray(); + + //make sure it doesn't already exist + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMember_LoginName")) == false) + { + Create.Index("IX_cmsMember_LoginName").OnTable("cmsMember") + .OnColumn("LoginName") + .Ascending() + .WithOptions() + .NonClustered(); + } + } + + public override void Down() + { + Delete.Index("IX_cmsMember_LoginName").OnTable("cmsMember"); + } + } +} \ No newline at end of file From 2b82520067444bb3f7906ec9f3436f3219d13f0f Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 10 Feb 2017 15:38:53 +1100 Subject: [PATCH 49/58] U4-8998 umbracoRelation table needs unique index on columns: parentId, childId, relType --- src/Umbraco.Core/Models/Rdbms/RelationDto.cs | 1 + .../AddIndexToUmbracoNodePath.cs | 9 +-- .../AddIndexesToUmbracoRelation.cs | 68 +++++++++++++++++++ .../SqlSyntax/SqlSyntaxProviderExtensions.cs | 18 ++++- src/Umbraco.Core/Services/RelationService.cs | 4 +- src/Umbraco.Core/Umbraco.Core.csproj | 1 + .../SqlCeSyntaxProviderTests.cs | 13 ++++ 7 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs diff --git a/src/Umbraco.Core/Models/Rdbms/RelationDto.cs b/src/Umbraco.Core/Models/Rdbms/RelationDto.cs index 368904a5cb..d3d741a191 100644 --- a/src/Umbraco.Core/Models/Rdbms/RelationDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/RelationDto.cs @@ -16,6 +16,7 @@ namespace Umbraco.Core.Models.Rdbms [Column("parentId")] [ForeignKey(typeof(NodeDto), Name = "FK_umbracoRelation_umbracoNode")] + [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelation_parentChildType", ForColumns = "parentId,childId,relType")] public int ParentId { get; set; } [Column("childId")] diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs index 229311dd9f..e59252390a 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexToUmbracoNodePath.cs @@ -14,14 +14,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero public override void Up() { - var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database) - .Select(x => new DbIndexDefinition() - { - TableName = x.Item1, - IndexName = x.Item2, - ColumnName = x.Item3, - IsUnique = x.Item4 - }).ToArray(); + var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database); //make sure it doesn't already exist if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoNodePath")) == false) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs new file mode 100644 index 0000000000..88c1378e49 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs @@ -0,0 +1,68 @@ +using System; +using System.Linq; +using Umbraco.Core.Logging; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero +{ + [Migration("7.6.0", 0, Constants.System.UmbracoMigrationName)] + public class AddIndexesToUmbracoRelation : MigrationBase + { + public AddIndexesToUmbracoRelation(ISqlSyntaxProvider sqlSyntax, ILogger logger) + : base(sqlSyntax, logger) + { } + + public override void Up() + { + //Ensure this executes in a defered block which will be done inside of the migration transaction + this.Execute.Code(database => + { + var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database); + + //make sure it doesn't already exist + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelation_parentChildType")) == false) + { + //We need to check if this index has corrupted data and then clear that data + var duplicates = database.Fetch("SELECT parentId,childId,relType FROM umbracoRelation GROUP BY parentId,childId,relType HAVING COUNT(*) > 1"); + if (duplicates.Count > 0) + { + //need to fix this there cannot be duplicates so we'll take the latest entries, it's really not going to matter though + foreach (var duplicate in duplicates) + { + var ids = database.Fetch("SELECT id FROM umbracoRelation WHERE parentId=@parentId AND childId=@childId AND relType=@relType ORDER BY datetime DESC", + new { parentId = duplicate.parentId, childId = duplicate.childId, relType = duplicate.relType }); + + if (ids.Count == 1) + { + //this is just a safety check, this should absolutely never happen + throw new InvalidOperationException("Duplicates were detected but could not be discovered"); + } + + //delete the others + ids = ids.Skip(0).ToList(); + + //iterate in groups of 2000 to avoid the max sql parameter limit + foreach (var idGroup in ids.InGroupsOf(2000)) + { + database.Execute("DELETE FROM umbracoRelation WHERE id IN (@ids)", new { ids = idGroup }); + } + } + } + } + return ""; + }); + + Create.Index("IX_umbracoRelation_parentChildType").OnTable("umbracoRelation") + .OnColumn("parentId").Ascending() + .OnColumn("childId").Ascending() + .OnColumn("relType").Ascending() + .WithOptions() + .Unique(); + } + + public override void Down() + { + Delete.Index("IX_umbracoNodePath").OnTable("umbracoNode"); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs index 1231765f20..f0bafdacf7 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs @@ -1,7 +1,23 @@ -namespace Umbraco.Core.Persistence.SqlSyntax +using System.Collections.Generic; +using System.Linq; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; + +namespace Umbraco.Core.Persistence.SqlSyntax { internal static class SqlSyntaxProviderExtensions { + public static IEnumerable GetDefinedIndexesDefinitions(this ISqlSyntaxProvider sql, Database db) + { + return sql.GetDefinedIndexes(db) + .Select(x => new DbIndexDefinition() + { + TableName = x.Item1, + IndexName = x.Item2, + ColumnName = x.Item3, + IsUnique = x.Item4 + }).ToArray(); + } + /// /// Returns the quotes tableName.columnName combo /// diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs index ec42d4bd74..76222810d2 100644 --- a/src/Umbraco.Core/Services/RelationService.cs +++ b/src/Umbraco.Core/Services/RelationService.cs @@ -215,7 +215,7 @@ namespace Umbraco.Core.Services using (var uow = UowProvider.GetUnitOfWork(commit: true)) { var repository = RepositoryFactory.CreateRelationRepository(uow); - var query = new Query().Where(x => x.ChildId == id || x.ParentId == id); + var query = new Query().Where(x => x.ParentId == id || x.ChildId == id); return repository.GetByQuery(query); } } @@ -230,7 +230,7 @@ namespace Umbraco.Core.Services if (relationType == null) return Enumerable.Empty(); var relationRepo = RepositoryFactory.CreateRelationRepository(uow); - var query = new Query().Where(x => (x.ChildId == id || x.ParentId == id) && x.RelationTypeId == relationType.Id); + var query = new Query().Where(x => (x.ParentId == id || x.ChildId == id) && x.RelationTypeId == relationType.Id); return relationRepo.GetByQuery(query); } } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 94267cf21f..9be8679626 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -479,6 +479,7 @@ + diff --git a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs index fafddb8dfd..105b3d0c11 100644 --- a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs +++ b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs @@ -121,6 +121,19 @@ WHERE (([umbracoNode].[nodeObjectType] = @0))) x)".Replace(Environment.NewLine, Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", createExpression.ToString()); } + [Test] + public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex_Multi_Columnn() + { + var sqlSyntax = new SqlServerSyntaxProvider(); + var createExpression = new CreateIndexExpression(DatabaseProviders.SqlServer, new[] { DatabaseProviders.SqlServer }, sqlSyntax) + { + Index = { Name = "IX_AB" } + }; + var builder = new CreateIndexBuilder(createExpression); + builder.OnTable("TheTable").OnColumn("A").Ascending().OnColumn("B").Ascending().WithOptions().Unique(); + Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_AB] ON [TheTable] ([A],[B])", createExpression.ToString()); + } + [Test] public void CreateIndexBuilder_SqlServer_Clustered_CreatesClusteredIndex() { From aa0eaf590c1bc16c70b133172140a12cf3d5fa86 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 10 Feb 2017 15:51:41 +1100 Subject: [PATCH 50/58] adds indexes to relation type --- .../Models/Rdbms/RelationTypeDto.cs | 2 + ...s => AddIndexesToUmbracoRelationTables.cs} | 57 +++++++++++++------ src/Umbraco.Core/Umbraco.Core.csproj | 2 +- 3 files changed, 43 insertions(+), 18 deletions(-) rename src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/{AddIndexesToUmbracoRelation.cs => AddIndexesToUmbracoRelationTables.cs} (52%) diff --git a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs index 54052f58a3..d13ce33520 100644 --- a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs @@ -29,11 +29,13 @@ namespace Umbraco.Core.Models.Rdbms public Guid ChildObjectType { get; set; } [Column("name")] + [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_name")] public string Name { get; set; } [Column("alias")] [NullSetting(NullSetting = NullSettings.Null)] [Length(100)] + [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_alias")] public string Alias { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs similarity index 52% rename from src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs rename to src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs index 88c1378e49..b8c0d78ef1 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelation.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/AddIndexesToUmbracoRelationTables.cs @@ -6,21 +6,22 @@ using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero { [Migration("7.6.0", 0, Constants.System.UmbracoMigrationName)] - public class AddIndexesToUmbracoRelation : MigrationBase + public class AddIndexesToUmbracoRelationTables : MigrationBase { - public AddIndexesToUmbracoRelation(ISqlSyntaxProvider sqlSyntax, ILogger logger) + public AddIndexesToUmbracoRelationTables(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger) { } public override void Up() { - //Ensure this executes in a defered block which will be done inside of the migration transaction - this.Execute.Code(database => - { - var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database); + var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database).ToArray(); - //make sure it doesn't already exist - if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelation_parentChildType")) == false) + //make sure it doesn't already exist + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelation_parentChildType")) == false) + { + //This will remove any corrupt/duplicate data in the relation table before the index is applied + //Ensure this executes in a defered block which will be done inside of the migration transaction + this.Execute.Code(database => { //We need to check if this index has corrupted data and then clear that data var duplicates = database.Fetch("SELECT parentId,childId,relType FROM umbracoRelation GROUP BY parentId,childId,relType HAVING COUNT(*) > 1"); @@ -48,16 +49,38 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero } } } - } - return ""; - }); + return ""; + }); + + //unique index to prevent duplicates - and for better perf + Create.Index("IX_umbracoRelation_parentChildType").OnTable("umbracoRelation") + .OnColumn("parentId").Ascending() + .OnColumn("childId").Ascending() + .OnColumn("relType").Ascending() + .WithOptions() + .Unique(); + } + + //need indexes on alias and name for relation type since these are queried against + + //make sure it doesn't already exist + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelationType_alias")) == false) + { + Create.Index("IX_umbracoRelationType_alias").OnTable("umbracoRelationType") + .OnColumn("alias") + .Ascending() + .WithOptions() + .NonClustered(); + } + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelationType_name")) == false) + { + Create.Index("IX_umbracoRelationType_name").OnTable("umbracoRelationType") + .OnColumn("name") + .Ascending() + .WithOptions() + .NonClustered(); + } - Create.Index("IX_umbracoRelation_parentChildType").OnTable("umbracoRelation") - .OnColumn("parentId").Ascending() - .OnColumn("childId").Ascending() - .OnColumn("relType").Ascending() - .WithOptions() - .Unique(); } public override void Down() diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 9be8679626..1ff334b03c 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -479,7 +479,7 @@ - + From aaa9c8f194464de32600d0180c5ba559d8a18d4b Mon Sep 17 00:00:00 2001 From: Emil Wangaa Date: Fri, 10 Feb 2017 09:24:14 +0100 Subject: [PATCH 51/58] Fixes delete of folders in partialviews,partialviewmacros and scripts --- src/Umbraco.Web/Editors/CodeFileController.cs | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index bcb6630c0a..e41311126c 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -1,5 +1,6 @@ using AutoMapper; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Net; using System.Net.Http; @@ -70,7 +71,6 @@ namespace Umbraco.Web.Editors } virtualPath = System.Web.HttpUtility.UrlDecode(virtualPath); - switch (type) { @@ -212,29 +212,46 @@ namespace Umbraco.Web.Editors { if (string.IsNullOrWhiteSpace(type) == false && string.IsNullOrWhiteSpace(virtualPath) == false) { + virtualPath = System.Web.HttpUtility.UrlDecode(virtualPath); + switch (type) { case Core.Constants.Trees.PartialViews: + if (IsDirectory(virtualPath, SystemDirectories.PartialViews)) + { + Services.FileService.DeletePartialViewFolder(virtualPath); + return Request.CreateResponse(HttpStatusCode.OK); + } if (Services.FileService.DeletePartialView(virtualPath, Security.CurrentUser.Id)) { return Request.CreateResponse(HttpStatusCode.OK); } - return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Partial View found with the specified path"); + return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Partial View or folder found with the specified path"); case Core.Constants.Trees.PartialViewMacros: + if (IsDirectory(virtualPath, SystemDirectories.MacroPartials)) + { + Services.FileService.DeletePartialViewMacroFolder(virtualPath); + return Request.CreateResponse(HttpStatusCode.OK); + } if (Services.FileService.DeletePartialViewMacro(virtualPath, Security.CurrentUser.Id)) { return Request.CreateResponse(HttpStatusCode.OK); } - return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Partial View Macro found with the specified path"); + return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Partial View Macro or folder found with the specified path"); case Core.Constants.Trees.Scripts: + if (IsDirectory(virtualPath, SystemDirectories.Scripts)) + { + Services.FileService.DeleteScriptFolder(virtualPath); + return Request.CreateResponse(HttpStatusCode.OK); + } if (Services.FileService.GetScriptByName(virtualPath) != null) { Services.FileService.DeleteScript(virtualPath, Security.CurrentUser.Id); return Request.CreateResponse(HttpStatusCode.OK); } - return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Script found with the specified path"); + return Request.CreateErrorResponse(HttpStatusCode.NotFound, "No Script or folder found with the specified path"); default: return Request.CreateResponse(HttpStatusCode.NotFound); @@ -388,5 +405,12 @@ namespace Umbraco.Web.Editors return value; } + + private bool IsDirectory(string virtualPath, string systemDirectory) + { + var path = IOHelper.MapPath(systemDirectory + "/" + virtualPath); + var dirInfo = new DirectoryInfo(path); + return dirInfo.Attributes == FileAttributes.Directory; + } } } From 7889f82a9aa26a2a2abea7b381765f08c748f3b7 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 10 Feb 2017 09:25:16 +0100 Subject: [PATCH 52/58] added a check so the 'ensure' wont fail if the path is already as it should be. added unit test for this method. --- src/Umbraco.Core/IO/IOHelper.cs | 6 ++++-- src/Umbraco.Tests/IO/IOHelperTest.cs | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index 5ce851bdb4..2ee0463435 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -382,7 +382,7 @@ namespace Umbraco.Core.IO path = relativePath; } - return path.EnsurePathIsPrefixed(); + return path.EnsurePathIsApplicationRootPrefixed(); } /// @@ -390,8 +390,10 @@ namespace Umbraco.Core.IO /// /// /// - internal static string EnsurePathIsPrefixed(this string path) + internal static string EnsurePathIsApplicationRootPrefixed(this string path) { + if (path.StartsWith("~/")) + return path; if (path.StartsWith("/") == false && path.StartsWith("\\") == false) path = string.Format("/{0}", path); if (path.StartsWith("~") == false) diff --git a/src/Umbraco.Tests/IO/IOHelperTest.cs b/src/Umbraco.Tests/IO/IOHelperTest.cs index 559ba1a2f3..e42491454b 100644 --- a/src/Umbraco.Tests/IO/IOHelperTest.cs +++ b/src/Umbraco.Tests/IO/IOHelperTest.cs @@ -56,5 +56,14 @@ namespace Umbraco.Tests.IO Assert.AreEqual(IOHelper.MapPath(SystemDirectories.WebServices, true), IOHelper.MapPath(SystemDirectories.WebServices, false)); Assert.AreEqual(IOHelper.MapPath(SystemDirectories.Xslt, true), IOHelper.MapPath(SystemDirectories.Xslt, false)); } + + [Test] + public void EnsurePathIsApplicationRootPrefixed() + { + //Assert + Assert.AreEqual("~/Views/Template.cshtml", IOHelper.EnsurePathIsApplicationRootPrefixed("Views/Template.cshtml")); + Assert.AreEqual("~/Views/Template.cshtml", IOHelper.EnsurePathIsApplicationRootPrefixed("/Views/Template.cshtml")); + Assert.AreEqual("~/Views/Template.cshtml", IOHelper.EnsurePathIsApplicationRootPrefixed("~/Views/Template.cshtml")); + } } } From 0dc0e681744a9887f4c5ab6b65cb8843de99d72a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 10 Feb 2017 10:36:58 +0100 Subject: [PATCH 53/58] reset pagination when searching --- .../common/directives/components/umbminilistview.directive.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 1a04eeff65..281242621a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -153,6 +153,8 @@ scope.searchMiniListView = function(search, miniListView) { // set search value miniListView.pagination.filter = search; + // reset pagination + miniListView.pagination.pageNumber = 1; // start loading animation list view miniListView.loading = true; searchMiniListView(miniListView); From 771f8d92f21760bc5b8f24c76c53f45a3b513ea4 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 10 Feb 2017 14:44:56 +0100 Subject: [PATCH 54/58] adding in missing extension method stuff for some udis. --- build/UmbracoVersion.txt | 2 +- src/SolutionInfo.cs | 2 +- .../Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Core/UdiGetterExtensions.cs | 22 ++++++++++++++----- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index 0294012380..b753b5efce 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,3 +1,3 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) 7.6.0 -alpha056 \ No newline at end of file +alpha061 \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 7fc240f4f0..19e4078131 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -12,4 +12,4 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("7.6.0")] -[assembly: AssemblyInformationalVersion("7.6.0-alpha056")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("7.6.0-alpha061")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index a741f65e4e..755de31ec4 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). ///
    /// The version comment. - public static string CurrentComment { get { return "alpha056"; } } + public static string CurrentComment { get { return "alpha061"; } } // Get the version of the umbraco.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Core/UdiGetterExtensions.cs index 1bd018a754..a9750fe464 100644 --- a/src/Umbraco.Core/UdiGetterExtensions.cs +++ b/src/Umbraco.Core/UdiGetterExtensions.cs @@ -285,18 +285,30 @@ namespace Umbraco.Core var member = entity as IMember; if (member != null) return member.GetUdi(); - var contentBase = entity as IContentBase; - if (contentBase != null) return contentBase.GetUdi(); + var stylesheet = entity as Stylesheet; + if (stylesheet != null) return stylesheet.GetUdi(); + + var script = entity as Script; + if (script != null) return script.GetUdi(); + + var dictionaryItem = entity as IDictionaryItem; + if (dictionaryItem != null) return dictionaryItem.GetUdi(); var macro = entity as IMacro; if (macro != null) return macro.GetUdi(); + var partialView = entity as IPartialView; + if (partialView != null) return partialView.GetUdi(); + + var xsltFile = entity as IXsltFile; + if (xsltFile != null) return xsltFile.GetUdi(); + + var contentBase = entity as IContentBase; + if (contentBase != null) return contentBase.GetUdi(); + var relationType = entity as IRelationType; if (relationType != null) return relationType.GetUdi(); - var dictionaryItem = entity as IDictionaryItem; - if (dictionaryItem != null) return dictionaryItem.GetUdi(); - throw new NotSupportedException(string.Format("Entity type {0} is not supported.", entity.GetType().FullName)); } } From deb8d652c56a6d04a558d30a93113ca09b9e0ac3 Mon Sep 17 00:00:00 2001 From: Claus Date: Mon, 13 Feb 2017 12:44:16 +0100 Subject: [PATCH 55/58] fixing PartialViewsTreeController reference in trees.Release.config. --- src/Umbraco.Web.UI/config/trees.Release.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/config/trees.Release.config b/src/Umbraco.Web.UI/config/trees.Release.config index 9b2b8e8b6f..74cce91001 100644 --- a/src/Umbraco.Web.UI/config/trees.Release.config +++ b/src/Umbraco.Web.UI/config/trees.Release.config @@ -11,7 +11,7 @@ - + From b519d68e1a8811715a9712698c39f5b80a86cbf2 Mon Sep 17 00:00:00 2001 From: Claus Date: Mon, 13 Feb 2017 13:34:35 +0100 Subject: [PATCH 56/58] fixing PartialViewMacrosTree and ScriptTree in trees.Release.config. --- src/Umbraco.Web.UI/config/trees.Release.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/config/trees.Release.config b/src/Umbraco.Web.UI/config/trees.Release.config index 74cce91001..dc29fe6417 100644 --- a/src/Umbraco.Web.UI/config/trees.Release.config +++ b/src/Umbraco.Web.UI/config/trees.Release.config @@ -14,7 +14,7 @@ - + @@ -25,7 +25,7 @@ - + From d504d8f54e3503d5e48cdc75b0a1366d2a63696f Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 13 Feb 2017 15:54:39 +0000 Subject: [PATCH 57/58] Update Core Deploy EntityTypes for Forms (Workflow is part of main form artifact) and we dont deploy records. Changing to PreValue & DataSources --- .../Constants-DeployEntityType.cs | 20 +++++++++---------- src/Umbraco.Core/Constants-ObjectTypes.cs | 16 +++++++-------- src/Umbraco.Core/Models/UmbracoObjectTypes.cs | 16 +++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Core/Constants-DeployEntityType.cs b/src/Umbraco.Core/Constants-DeployEntityType.cs index 0f91a3c086..a62ca3d8ef 100644 --- a/src/Umbraco.Core/Constants-DeployEntityType.cs +++ b/src/Umbraco.Core/Constants-DeployEntityType.cs @@ -40,8 +40,8 @@ namespace Umbraco.Core // forms public const string FormsForm = "forms-form"; - public const string FormsWorkflow = "forms-workflow"; - public const string FormsRecord = "forms-record"; + public const string FormsPreValue = "forms-prevalue"; + public const string FormsDataSource = "forms-datasource"; // string entity types @@ -89,10 +89,10 @@ namespace Umbraco.Core return RelationType; case UmbracoObjectTypes.FormsForm: return FormsForm; - case UmbracoObjectTypes.FormsWorkflow: - return FormsWorkflow; - case UmbracoObjectTypes.FormsRecord: - return FormsRecord; + case UmbracoObjectTypes.FormsPreValue: + return FormsPreValue; + case UmbracoObjectTypes.FormsDataSource: + return FormsDataSource; } throw new NotSupportedException(string.Format("UmbracoObjectType \"{0}\" does not have a matching EntityType.", umbracoObjectType)); } @@ -131,10 +131,10 @@ namespace Umbraco.Core return UmbracoObjectTypes.RelationType; case FormsForm: return UmbracoObjectTypes.FormsForm; - case FormsWorkflow: - return UmbracoObjectTypes.FormsWorkflow; - case FormsRecord: - return UmbracoObjectTypes.FormsRecord; + case FormsPreValue: + return UmbracoObjectTypes.FormsPreValue; + case FormsDataSource: + return UmbracoObjectTypes.FormsDataSource; } throw new NotSupportedException( string.Format("EntityType \"{0}\" does not have a matching UmbracoObjectType.", entityType)); diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs index 7bba427f12..d364c1379c 100644 --- a/src/Umbraco.Core/Constants-ObjectTypes.cs +++ b/src/Umbraco.Core/Constants-ObjectTypes.cs @@ -174,24 +174,24 @@ namespace Umbraco.Core public static readonly Guid FormsFormGuid = new Guid(FormsForm); /// - /// Guid for a Forms Workflow. + /// Guid for a Forms PreValue Source. /// - public const string FormsWorkflow = "42D7BF9B-A362-4FEE-B45A-674D5C064B70"; + public const string FormsPreValue = "42D7BF9B-A362-4FEE-B45A-674D5C064B70"; /// - /// Guid for a Forms Workflow. + /// Guid for a Forms PreValue Source. /// - public static readonly Guid FormsWorkflowGuid = new Guid(FormsWorkflow); + public static readonly Guid FormsPreValueGuid = new Guid(FormsPreValue); /// - /// Guid for a Forms Record. + /// Guid for a Forms DataSource. /// - public const string FormsRecord = "CFED6CE4-9359-443E-9977-9956FEB1D867"; + public const string FormsDataSource = "CFED6CE4-9359-443E-9977-9956FEB1D867"; /// - /// Guid for a Forms Record. + /// Guid for a Forms DataSource. /// - public static readonly Guid FormsRecordGuid = new Guid(FormsRecord); + public static readonly Guid FormsDataSourceGuid = new Guid(FormsDataSource); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs index b7bf07af34..68e6e1a815 100644 --- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs @@ -153,17 +153,17 @@ namespace Umbraco.Core.Models FormsForm, /// - /// Forms Workflow + /// Forms PreValue /// - [UmbracoObjectType(Constants.ObjectTypes.FormsWorkflow)] - [FriendlyName("Workflow")] - FormsWorkflow, + [UmbracoObjectType(Constants.ObjectTypes.FormsPreValue)] + [FriendlyName("PreValue")] + FormsPreValue, /// - /// Forms Record + /// Forms DataSource /// - [UmbracoObjectType(Constants.ObjectTypes.FormsRecord)] - [FriendlyName("Record")] - FormsRecord + [UmbracoObjectType(Constants.ObjectTypes.FormsDataSource)] + [FriendlyName("DataSource")] + FormsDataSource } } \ No newline at end of file From f30d7fc68cec0464a943b85ed6ecc32d42bb01a8 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 14 Feb 2017 14:29:23 +1100 Subject: [PATCH 58/58] Fixes nuspec to be net45 as a min --- build/NuSpecs/UmbracoCms.Core.nuspec | 62 +++++++++---------- build/UmbracoVersion.txt | 2 +- src/SolutionInfo.cs | 2 +- .../Configuration/UmbracoVersion.cs | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 4abb26377b..ce837f7189 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -44,37 +44,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index b753b5efce..0a909cc729 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,3 +1,3 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) 7.6.0 -alpha061 \ No newline at end of file +alpha062 \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 19e4078131..e7d7b208fc 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -12,4 +12,4 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("7.6.0")] -[assembly: AssemblyInformationalVersion("7.6.0-alpha061")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("7.6.0-alpha062")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 755de31ec4..9e325c9afd 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). ///
    /// The version comment. - public static string CurrentComment { get { return "alpha061"; } } + public static string CurrentComment { get { return "alpha062"; } } // Get the version of the umbraco.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx