From 5914690ad8839721ad60612af7f05e393e0065cd Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 25 Mar 2013 10:09:02 -0100 Subject: [PATCH 1/2] Allow leading sign in number field so that negative numbers are supported --- src/umbraco.editorControls/numberfield/numberField.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/umbraco.editorControls/numberfield/numberField.cs b/src/umbraco.editorControls/numberfield/numberField.cs index f5552e62ec..104cce102e 100644 --- a/src/umbraco.editorControls/numberfield/numberField.cs +++ b/src/umbraco.editorControls/numberfield/numberField.cs @@ -75,8 +75,8 @@ namespace umbraco.editorControls set { int integer; - - if (int.TryParse(value, NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out integer)) + + if (int.TryParse(value, NumberStyles.AllowThousands | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out integer)) { base.Text = integer.ToString(); } From 0e392b398c3b2f5708e904b46624a020a1ccd8e9 Mon Sep 17 00:00:00 2001 From: Stephen Roberts Date: Thu, 14 Mar 2013 11:08:02 +0000 Subject: [PATCH 2/2] Fixed Property order for document types with Master document types. --- .../umbraco.presentation/umbraco/controls/ContentControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs index 2b8df31950..0603bf125f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs @@ -133,7 +133,7 @@ namespace umbraco.controls // Iterate through the property types and add them to the tab // zb-00036 #29889 : fix property types getter to get the right set of properties // ge : had a bit of a corrupt db and got weird NRE errors so rewrote this to catch the error and rethrow with detail - foreach (PropertyType propertyType in tab.GetPropertyTypes(_content.ContentType.Id)) + foreach (PropertyType propertyType in tab.GetPropertyTypes(_content.ContentType.Id).OrderBy(x=>x.SortOrder)) { // table.Rows.Add(addControl(_content.getProperty(editPropertyType.Alias), tp)); var property = _content.getProperty(propertyType);