From b6bcdcb351db34a60c6e8ad878cbc978905ab86f Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Wed, 4 Dec 2013 13:39:51 +0100
Subject: [PATCH] fixes: U4-3728 Non-Mandatory Numeric property gives error
 when left blank

also fixes dimming on buttons fails when validation fails
---
 src/Umbraco.Core/PropertyEditors/IntegerValidator.cs     | 9 ++++++---
 .../src/views/content/content.edit.controller.js         | 1 +
 .../src/views/media/media.edit.controller.js             | 2 ++
 .../src/views/member/member.edit.controller.js           | 2 ++
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml            | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)

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<ValidationResult> Validate(object value, string config, PreValueCollection preValues, PropertyEditor editor)
         {
-            var result = value.TryConvertTo<int>();
-            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<int>();
+                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 @@
     <key alias="updateDate">Sidst redigeret</key>
     <key alias="uploadClear">Fjern fil</key>
     <key alias="urls">Link til dokument</key>
+
+    <key alias="childItems" version="7.0">Undersider</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>