diff --git a/src/Umbraco.Core/PropertyEditors/IntegerValidator.cs b/src/Umbraco.Core/PropertyEditors/IntegerValidator.cs index 27e4519a22..173506e77e 100644 --- a/src/Umbraco.Core/PropertyEditors/IntegerValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/IntegerValidator.cs @@ -12,10 +12,13 @@ namespace Umbraco.Core.PropertyEditors { public override IEnumerable Validate(object value, string config, PreValueCollection preValues, PropertyEditor editor) { - var result = value.TryConvertTo(); - if (result.Success == false) + if (value != null && value.ToString() != string.Empty) { - yield return new ValidationResult("The value " + value + " is not a valid integer", new[] {"value"}); + var result = value.TryConvertTo(); + if (result.Success == false) + { + yield return new ValidationResult("The value " + value + " is not a valid integer", new[] { "value" }); + } } } diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js index a47a066baa..27d2614330 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js @@ -152,6 +152,7 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, appS }); } else { + $scope.busy = false; deferred.reject(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index de372212f5..73820fa2f9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -79,6 +79,8 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, navi editorState.set($scope.content); $scope.busy = false; }); + }else{ + $scope.busy = false; } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index c7a259fe4c..bafa29bfd9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -121,6 +121,8 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS editorState.set($scope.content); $scope.busy = false; }); + }else{ + $scope.busy = false; } }; diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 54c64b6a70..71cd5ab809 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -112,6 +112,8 @@ Sidst redigeret Fjern fil Link til dokument + + Undersider Hvor ønsker du at oprette den nye %0%