Changeset 6268

Timestamp:

05/24/11 17:35:29 (14 years ago)

Author:

cfleisch

Message:

#1499 added test to validate StringComparisonFilter in view Filters

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• ViewModels/FilterModel.cs (modified) (3 diffs)
• Views/Filter/Filters.ascx (modified) (2 diffs)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/FilterModel.cs

@@ -6 +6 @@
 using HLWebOKBQueryPlugin.Helpers;
 using HLWebOKBQueryPlugin.ViewModels;
+using System.ComponentModel.DataAnnotations;
 
 namespace HLWebOKBQueryPlugin.Models
@@ -25 +26 @@
         public static string ComparisonDropDownList { get { return "comparisonDropDownList"; } }
 
+        [Required(ErrorMessage = "Field is required!")]
+        [StringLength(50, ErrorMessage = "Maximum 50 characters allowed!")]
+        public string IntValue { get; set; }
+
         /// <summary>
         /// Constructor
@@ -200 +205 @@
                                 {
                                     ((StringComparisonFilter)f).Value = kvp.Value;
+                                    IntValue = kvp.Value;
                                 }
                                 else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

@@ -3 +3 @@
 <%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
 <%@ Import Namespace="HLWebOKBQueryPlugin.ViewModels" %>
+
+
+<script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
+<script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
+
+<% Html.EnableClientValidation(); %>
 
 <!-- Put all into a form that calls the "AddFilter" Action-->
@@ -46 +52 @@
     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
+    <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value)) %>
+    <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue) %>
     <% }
 else if ("NameStringComparisonFilter".Equals(f.GetType().Name))