From b5d6daea31a1a2126be9b563d55fc302221a1422 Mon Sep 17 00:00:00 2001
From: stherrienaspnet <stherrienaspnet@gmail.com>
Date: Fri, 9 Dec 2016 21:49:20 -0500
Subject: [PATCH 1/3] Fix form field not displaying sequalize error

---
 .../app/client/app/account(auth)/signup/signup.controller.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/app/client/app/account(auth)/signup/signup.controller.js b/templates/app/client/app/account(auth)/signup/signup.controller.js
index 85e71d28f..6801f33ca 100644
--- a/templates/app/client/app/account(auth)/signup/signup.controller.js
+++ b/templates/app/client/app/account(auth)/signup/signup.controller.js
@@ -66,7 +66,7 @@ export default class SignupController {
         <%_ if(filters.sequelizeModels) { -%>
         // Update validity of form fields that match the sequelize errors
         if(err.name) {
-          angular.forEach(err.fields, field => {
+          angular.forEach(err.fields, (error, field) => {
             form[field].$setValidity('mongoose', false);
             this.errors[field] = err.message;
           });

From 3c42fdb2a2e13cfdbb01961aa0b2373a9eb19b9b Mon Sep 17 00:00:00 2001
From: stherrienaspnet <stherrienaspnet@gmail.com>
Date: Thu, 15 Dec 2016 21:12:53 -0500
Subject: [PATCH 2/3] fix: Fix form field not displaying sequalize error

fix: Fix form field not displaying sequalize error

Display form field error when using sequelize as database
---
 .../app/client/app/account(auth)/signup/signup.controller.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/app/client/app/account(auth)/signup/signup.controller.js b/templates/app/client/app/account(auth)/signup/signup.controller.js
index 6801f33ca..da67bedf7 100644
--- a/templates/app/client/app/account(auth)/signup/signup.controller.js
+++ b/templates/app/client/app/account(auth)/signup/signup.controller.js
@@ -66,7 +66,7 @@ export default class SignupController {
         <%_ if(filters.sequelizeModels) { -%>
         // Update validity of form fields that match the sequelize errors
         if(err.name) {
-          angular.forEach(err.fields, (error, field) => {
+          angular.forEach(err.fields, (error, field) => { 
             form[field].$setValidity('mongoose', false);
             this.errors[field] = err.message;
           });

From f283e4c5e730cea3d7ac16798bfd479c52275df8 Mon Sep 17 00:00:00 2001
From: stherrienaspnet <stherrienaspnet@gmail.com>
Date: Sat, 11 Mar 2017 22:29:03 -0500
Subject: [PATCH 3/3] Fixed match integration for Babel & Typescript

---
 src/generators/app/index.js     | 3 ++-
 templates/app/client/app/app.js | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/generators/app/index.js b/src/generators/app/index.js
index c1ce3c28a..fe914e588 100644
--- a/src/generators/app/index.js
+++ b/src/generators/app/index.js
@@ -547,7 +547,8 @@ export class Generator extends Base {
             ['ngRoute', 'angular-route'],
             ['uiBootstrap', 'angular-ui-bootstrap'],
             ['ngMessages', 'angular-messages'],
-            ['io', 'socket.io-client']
+            ['io', 'socket.io-client'],
+            ['ngValidationMatch', 'angular-validation-match'] 
           ];
           function replacer(contents) {
             modulesToFix.forEach(([moduleName, importName]) => {
diff --git a/templates/app/client/app/app.js b/templates/app/client/app/app.js
index e86e3e4ff..40f47388a 100644
--- a/templates/app/client/app/app.js
+++ b/templates/app/client/app/app.js
@@ -4,7 +4,7 @@ import angular from 'angular';
 import ngCookies from 'angular-cookies';
 import ngResource from 'angular-resource';
 import ngSanitize from 'angular-sanitize';
-import ngValidationMatch from 'angular-validation-match';
+
 <%_ if(filters.socketio) { _%>
 import 'angular-socket-io';<% } %>
 <%_ if(filters.ngroute) { _%>
@@ -15,6 +15,7 @@ import uiRouter from 'angular-ui-router';<% } %>
 import uiBootstrap from 'angular-ui-bootstrap';<% } %>
 // import ngMessages from 'angular-messages';
 <%_ if(filters.auth) { _%>
+import ngValidationMatch from 'angular-validation-match';
 <% } %>
 
 
@@ -39,7 +40,6 @@ angular.module('<%= scriptAppName %>', [
   ngCookies,
   ngResource,
   ngSanitize,
-  'validation.match',
   <%_ if(filters.socketio) { %>
   'btford.socket-io',<% } %>
   <%_ if(filters.ngroute) { %>
@@ -51,7 +51,9 @@ angular.module('<%= scriptAppName %>', [
   <%_ if(filters.auth) { %>
   _Auth,
   account,
-  admin,<% } _%>
+  admin,
+  'validation.match',
+  <% } _%>
   navbar,
   footer,
   main,