From c4c618fafdbe52919d5bbc736bc3ceef707916d7 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 23 Feb 2015 21:23:44 -0800
Subject: [PATCH] React to MVC changes.

---
 .../Helpers/AngularExtensions.cs              | 26 +++++++++----------
 .../BuddyModelMetadataProvider.cs             |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/MusicStore.Spa/Helpers/AngularExtensions.cs b/src/MusicStore.Spa/Helpers/AngularExtensions.cs
index 037c1128cf..ea35dfb9fc 100644
--- a/src/MusicStore.Spa/Helpers/AngularExtensions.cs
+++ b/src/MusicStore.Spa/Helpers/AngularExtensions.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
         public static HtmlString ngTextBoxFor<TModel, TProperty>(this IHtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression, IDictionary<string, object> htmlAttributes)
         {
             var expressionText = ExpressionHelper.GetExpressionText(expression);
-            var metadata = ExpressionMetadataProvider.FromLambdaExpression(expression, html.ViewData, html.MetadataProvider);
+            var modelExplorer = ExpressionMetadataProvider.FromLambdaExpression(expression, html.ViewData, html.MetadataProvider);
             var ngAttributes = new Dictionary<string, object>();
 
             ngAttributes["type"] = "text";
@@ -51,20 +51,20 @@ namespace Microsoft.AspNet.Mvc.Rendering
             ngAttributes["ng-model"] = valueFieldName;
 
             // Set input type
-            if (string.Equals(metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.EmailAddress), StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(modelExplorer.Metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.EmailAddress), StringComparison.OrdinalIgnoreCase))
             {
                 ngAttributes["type"] = "email";
             }
-            else if (metadata.ModelType == typeof(Uri)
-                     || string.Equals(metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.Url), StringComparison.OrdinalIgnoreCase)
-                     || string.Equals(metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.ImageUrl), StringComparison.OrdinalIgnoreCase))
+            else if (modelExplorer.ModelType == typeof(Uri)
+                     || string.Equals(modelExplorer.Metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.Url), StringComparison.OrdinalIgnoreCase)
+                     || string.Equals(modelExplorer.Metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.ImageUrl), StringComparison.OrdinalIgnoreCase))
             {
                 ngAttributes["type"] = "url";
             }
-            else if (IsNumberType(metadata.ModelType))
+            else if (IsNumberType(modelExplorer.ModelType))
             {
                 ngAttributes["type"] = "number";
-                if (IsIntegerType(metadata.ModelType))
+                if (IsIntegerType(modelExplorer.ModelType))
                 {
                     ngAttributes["step"] = "1";
                 }
@@ -73,20 +73,20 @@ namespace Microsoft.AspNet.Mvc.Rendering
                     ngAttributes["step"] = "any";
                 }
             }
-            else if (metadata.ModelType == typeof(DateTime))
+            else if (modelExplorer.ModelType == typeof(DateTime))
             {
-                if (string.Equals(metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.Date), StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(modelExplorer.Metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.Date), StringComparison.OrdinalIgnoreCase))
                 {
                     ngAttributes["type"] = "date";
                 }
-                else if (string.Equals(metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.DateTime), StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(modelExplorer.Metadata.DataTypeName, Enum.GetName(typeof(DataType), DataType.DateTime), StringComparison.OrdinalIgnoreCase))
                 {
                     ngAttributes["type"] = "datetime";
                 }
             }
 
             // Add attributes for Angular validation
-            var clientValidators = html.GetClientValidationRules(metadata, null);
+            var clientValidators = html.GetClientValidationRules(modelExplorer, null);
 
             foreach (var validator in clientValidators)
             {
@@ -133,9 +133,9 @@ namespace Microsoft.AspNet.Mvc.Rendering
             }
 
             // Render!
-            if (metadata.Model != null)
+            if (modelExplorer.Model != null)
             {
-                ngAttributes.Add("value", metadata.Model.ToString());
+                ngAttributes.Add("value", modelExplorer.Model.ToString());
             }
 
             var tag = new TagBuilder("input");
diff --git a/src/MusicStore.Spa/Infrastructure/BuddyModelMetadataProvider.cs b/src/MusicStore.Spa/Infrastructure/BuddyModelMetadataProvider.cs
index 5ece2ffb32..265c323263 100644
--- a/src/MusicStore.Spa/Infrastructure/BuddyModelMetadataProvider.cs
+++ b/src/MusicStore.Spa/Infrastructure/BuddyModelMetadataProvider.cs
@@ -27,7 +27,7 @@ namespace MusicStore.Spa.Infrastructure
                         realProperty.IsRequired = buddyProperty.IsRequired;
                         realProperty.DisplayName = buddyProperty.DisplayName;
                         realProperty.DisplayFormatString = buddyProperty.DisplayFormatString;
-                        realProperty.SimpleDisplayText = buddyProperty.SimpleDisplayText;
+                        realProperty.SimpleDisplayProperty = buddyProperty.SimpleDisplayProperty;
                         realProperty.DataTypeName = buddyProperty.DataTypeName;
                         realProperty.Description = buddyProperty.Description;
                         realProperty.EditFormatString = buddyProperty.EditFormatString;