Merge pull request #706 from abhijeet2083/master

fixed the issue where organization dropdown error not clearing on account registration page #704
HTBox · Apr 22, 2017 · 2d837f2 · 2d837f2
2 parents df644d9 + bcfdd5d
commit 2d837f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/crisischeckin/crisicheckinweb/App_Start/BundleConfig.cs b/crisischeckin/crisicheckinweb/App_Start/BundleConfig.cs
@@ -21,6 +21,9 @@ public static void RegisterBundles(BundleCollection bundles)
                 "~/Scripts/jquery-ui-1.10.4.js",
                 "~/Scripts/bootstrap.js"));
 
+            bundles.Add(new ScriptBundle("~/bundles/jquery-validate").Include(
+                "~/Scripts/jquery.validate.min.js",
+                "~/Scripts/jquery.validate.unobtrusive.min.js"));
         }
     }
 }
diff --git a/crisischeckin/crisicheckinweb/Views/Account/Register.cshtml b/crisischeckin/crisicheckinweb/Views/Account/Register.cshtml
@@ -1,4 +1,6 @@
-@model crisicheckinweb.ViewModels.RegisterModel
+@using System.Web.Optimization
+
+@model crisicheckinweb.ViewModels.RegisterModel
 
 @{
   ViewBag.Title = "Create new account...";
@@ -63,5 +65,6 @@
 
 @section scripts
 {
+    @Scripts.Render("~/bundles/jquery-validate")
     <script src="~/scripts/App/accountRegister.js"></script>
 }
diff --git a/crisischeckin/crisicheckinweb/Web.config b/crisischeckin/crisicheckinweb/Web.config
@@ -36,6 +36,8 @@
     <add key="SMS.fromphone" value="+15005550006" /> <!-- Messages will be delivered to C:\Users\[USER]\AppData\Roaming -->
     <add key="twilio.account.sid" value="xxxxxx" />
     <add key="twilio.auth.token" value="xxxxxx" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
   </appSettings>
   <system.net>
     <mailSettings>