huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug# 289 

The ordering algorithm was ignoring errors that came from user code,
and only respected errors from model properties
This commit is contained in:
Yishai Galatzer 2014-04-28 12:51:55 -07:00
parent 8d53d40647
commit 3636440cae
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Microsoft.AspNet.Mvc.Core/Rendering/Html/ValidationHelpers.cs
View File

@ -42,25 +42,44 @@ namespace Microsoft.AspNet.Mvc.Rendering
}
else
{
// Sort modelStates to respect the ordering in the metadata.
// ModelState doesn't refer to ModelMetadata, but we can correlate via the property name.
var ordering = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
var metadata = viewData.ModelMetadata;
if (metadata != null)
{
foreach (var data in metadata.Properties)
{
ordering[data.PropertyName] = data.Order;
}
var orderer = new ErrorsOrderer(metadata);
return viewData.ModelState
.OrderBy(data => ordering[data.Key])
.OrderBy(data => orderer.GetOrder(data.Key))
.Select(ms => ms.Value);
}
return viewData.ModelState.Values;
}
}
// Helper for sorting modelStates to respect the ordering in the metadata.
// ModelState doesn't refer to ModelMetadata, but we can correlate via the property name.
private class ErrorsOrderer
{
private Dictionary<string, int> _ordering = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
public ErrorsOrderer([NotNull] ModelMetadata metadata)
{
foreach (var data in metadata.Properties)
{
_ordering[data.PropertyName] = data.Order;
}
}
public int GetOrder(string key)
{
int value;
if (_ordering.TryGetValue(key, out value))
{
return value;
}
return ModelMetadata.DefaultOrder;
}
}
}
}