From 878c6a38b5d95f1c158b45ac384f42e9e57704ea Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 6 Mar 2017 12:39:29 -0800
Subject: [PATCH] fix delete form modal in /forms view

---
 public/modules/core/controllers/header.client.controller.js    | 1 -
 .../forms/admin/controllers/list-forms.client.controller.js    | 3 +--
 public/modules/forms/admin/views/list-forms.client.view.html   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js
index 7f2b124c..57332278 100755
--- a/public/modules/core/controllers/header.client.controller.js
+++ b/public/modules/core/controllers/header.client.controller.js
@@ -7,7 +7,6 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
 
 		$scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User);
 
-		console.log(Auth.ensureHasCurrentUser(User));
 	    $scope.authentication = $rootScope.authentication = Auth;
 
 		$rootScope.languages = $scope.languages = ['en', 'fr', 'es', 'it', 'de'];
diff --git a/public/modules/forms/admin/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js
index c2ec09fd..23d24568 100644
--- a/public/modules/forms/admin/controllers/list-forms.client.controller.js
+++ b/public/modules/forms/admin/controllers/list-forms.client.controller.js
@@ -28,8 +28,7 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope
 					$scope.cancel = $scope.cancelDeleteModal;
 
 					$scope.deleteForm = function() {
-						$scope.removeForm(items.formIndex);
-
+						$scope.$parent.removeForm(items.formIndex);
 					}
 				},
 				resolve: {
diff --git a/public/modules/forms/admin/views/list-forms.client.view.html b/public/modules/forms/admin/views/list-forms.client.view.html
index 86450243..71ab5624 100644
--- a/public/modules/forms/admin/views/list-forms.client.view.html
+++ b/public/modules/forms/admin/views/list-forms.client.view.html
@@ -19,7 +19,7 @@
 	</div>
 	<div class="modal-footer">
 		<input type="text" style="width:100%" data-ng-model="deleteConfirm" class="input-block" autofocus required aria-label="Type in the name of the form to confirm that you want to delete this form.">
-		<button type="submit" ng-click="deleteForm" class="btn btn-block btn-danger" ng-disabled="content.currFormTitle != deleteConfirm">
+		<button type="submit" ng-click="deleteForm()" class="btn btn-block btn-danger" ng-disabled="content.currFormTitle != deleteConfirm">
 			{{ 'I_UNDERSTAND' | translate }}
 		</button>
 	</div>