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

Fixes content service publishing status when parent isn't published, fixes listview to properly have selected checkbox (ng-checked is not supposed to be used), fixes the pre-check if nothing is actually selected before performing bulk operations - U4-3149

Browse Source
This commit is contained in:
Shannon
2013-10-15 14:11:28 +11:00
parent 754ed06d86
commit e2e40a3356
5 changed files with 238 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -1633,11 +1633,14 @@ namespace Umbraco.Core.Services
//Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
publishStatus.StatusType = CheckAndLogIsPublishable(content);
//if it is not successful, then check if the props are valid
if ((int)publishStatus.StatusType < 10)
{
//Content contains invalid property values and can therefore not be published - fire event?
publishStatus.StatusType = CheckAndLogIsValid(content);
//set the invalid properties (if there are any)
publishStatus.InvalidProperties = ((ContentBase)content).LastInvalidProperties;
}
//if we're still successful, then publish using the strategy
if (publishStatus.StatusType == PublishStatusType.Success)
{

6
src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
View File

@@ -53,8 +53,10 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser
}
//check for changed built-in properties of the content
if (!_.isEqual(origContent.name, newContent.name)) {
origContent.name = newContent.name;
for (var o in origContent) {
if (!_.isEqual(origContent[o], newContent[o])) {
origContent[o] = newContent[o];
}
}
//check for changed properties of the content

107
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -1,9 +1,12 @@
angular.module("umbraco")
.controller("Umbraco.PropertyEditors.ListViewController",
function ($rootScope, $scope, $routeParams, contentResource, contentTypeResource, notificationsService, iconHelper) {
function ($rootScope, $scope, $routeParams, contentResource, contentTypeResource, notificationsService, iconHelper, dialogService) {
$scope.selected = [];
$scope.actionInProgress = false;
$scope.listViewResultSet = {
totalPages: 0,
items: []
};
$scope.options = {
pageSize: 10,
@@ -69,56 +72,25 @@ angular.module("umbraco")
});
};
var updateSelected = function (action, id) {
if (action === 'add' && $scope.selected.indexOf(id) === -1) {
$scope.selected.push(id);
}
if (action === 'remove' && $scope.selected.indexOf(id) !== -1) {
$scope.selected.splice($scope.selected.indexOf(id), 1);
}
};
$scope.updateSelection = function ($event, item) {
if(item.selected){
item.selected = false;
var index = $scope.selected.indexOf(item.id);
if(index){
$scope.selected.splice(index, 1);
}
}else{
item.selected = true;
$scope.selected.push(item.id);
}
};
$scope.selectAll = function ($event) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
for (var i = 0; i < $scope.listViewResultSet.items.length; i++) {
var entity = $scope.listViewResultSet.items[i];
entity.selected = checkbox.checked;
updateSelected(action, entity.id);
}
};
$scope.getSelectedClass = function (entity) {
return $scope.isSelected(entity.id) ? 'selected' : '';
};
$scope.isSelected = function (id) {
return $scope.selected.indexOf(id) >= 0;
};
$scope.isSelectedAll = function () {
if ($scope.listViewResultSet != null)
return $scope.selected.length === $scope.listViewResultSet.items.length;
else
return false;
return _.every($scope.listViewResultSet.items, function (item) {
return item.selected;
});
};
$scope.isAnythingSelected = function () {
return $scope.selected.length > 0;
return _.some($scope.listViewResultSet.items, function (item) {
return item.selected;
});
};
$scope.getIcon = function (entry) {
@@ -126,19 +98,25 @@ angular.module("umbraco")
};
$scope.delete = function () {
var selected = _.filter($scope.listViewResultSet.items, function (item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
return;
}
if (confirm("Sure you want to delete?") == true) {
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with delete";
var current = 1;
var total = $scope.selected.length;
for (var i = 0; i < $scope.selected.length; i++) {
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Deleted doc " + current + " out of " + total + " documents";
contentResource.deleteById($scope.selected[i]).then(function(data) {
if (current == total) {
contentResource.deleteById(selected[i].id).then(function (data) {
if (current === total) {
notificationsService.success("Bulk action", "Deleted " + total + "documents");
$scope.bulkStatus = "";
$scope.selected = [];
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
}
@@ -150,14 +128,22 @@ angular.module("umbraco")
};
$scope.publish = function () {
var selected = _.filter($scope.listViewResultSet.items, function (item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
return;
}
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with publish";
var current = 1;
var total = $scope.selected.length;
for (var i = 0; i < $scope.selected.length; i++) {
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Publishing " + current + " out of " + total + " documents";
contentResource.publishById($scope.selected[i])
contentResource.publishById(selected[i].id)
.then(function (content) {
if (current == total) {
notificationsService.success("Bulk action", "Published " + total + "documents");
@@ -166,20 +152,41 @@ angular.module("umbraco")
$scope.actionInProgress = false;
}
current++;
}, function (err) {
$scope.bulkStatus = "";
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
//if there are validation errors for publishing then we need to show them
if (err.status === 400 && err.data && err.data.Message) {
notificationsService.error("Publish error", err.data.Message);
}
else {
dialogService.ysodDialog(err);
}
});
}
};
$scope.unpublish = function () {
var selected = _.filter($scope.listViewResultSet.items, function (item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
return;
}
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with publish";
var current = 1;
var total = $scope.selected.length;
for (var i = 0; i < $scope.selected.length; i++) {
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Unpublishing " + current + " out of " + total + " documents";
contentResource.unPublish($scope.selected[i])
contentResource.unPublish(selected[i].id)
.then(function (content) {
if (current == total) {

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View File

@@ -53,8 +53,7 @@
<td>
<i class="icon {{result.icon}}" ng-class="getIcon(result)"></i>
<input type="checkbox"
ng-checked="result.selected" ng-click="updateSelection($event, result)"></td>
<input type="checkbox" ng-model="result.selected"></td>
<td>
<a ng-class="{inactive:!result.published}" href="#/content/content/edit/{{result.id}}">{{result.name}}</a></td>
<td>{{result.updateDate|date:'medium'}}

29
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -309,7 +309,34 @@ namespace Umbraco.Web.Editors
return HandleContentNotFound(id, false);
}
Services.ContentService.Publish(foundContent, UmbracoUser.Id);
var publishResult = Services.ContentService.PublishWithStatus(foundContent, UmbracoUser.Id);
if (publishResult.Success == false)
{
switch (publishResult.Result.StatusType)
{
case PublishStatusType.FailedPathNotPublished:
return Request.CreateValidationErrorResponse(
ui.Text("publish", "contentPublishedFailedByParent",
string.Format("{0} ({1})", publishResult.Result.ContentItem.Name, publishResult.Result.ContentItem.Id),
Security.CurrentUser).Trim());
case PublishStatusType.FailedCancelledByEvent:
return Request.CreateValidationErrorResponse(
ui.Text("speechBubbles", "contentPublishedFailedByEvent"));
case PublishStatusType.FailedHasExpired:
case PublishStatusType.FailedAwaitingRelease:
case PublishStatusType.FailedIsTrashed:
case PublishStatusType.FailedContentInvalid:
return Request.CreateValidationErrorResponse(
ui.Text("publish", "contentPublishedFailedInvalid",
new[]
{
string.Format("{0} ({1})", publishResult.Result.ContentItem.Name, publishResult.Result.ContentItem.Id),
string.Join(",", publishResult.Result.InvalidProperties.Select(x => x.Alias))
}, Security.CurrentUser));
}
}
//return ok
return Request.CreateResponse(HttpStatusCode.OK);
}