From 3b0af059d24ef170979fe2123ac29231159e769f Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 14 Nov 2016 11:10:51 -0800
Subject: [PATCH] fixed hide logicJump in admin panel

---
 app/models/logic_jump.server.model.js         |  2 +-
 public/dist/application.js                    | 21 +++++++++----------
 .../form/edit-form.client.view.html           |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/models/logic_jump.server.model.js b/app/models/logic_jump.server.model.js
index 650d1fe8..b70d951b 100644
--- a/app/models/logic_jump.server.model.js
+++ b/app/models/logic_jump.server.model.js
@@ -32,7 +32,7 @@ var LogicJumpSchema = new Schema({
 			'field begins static',
 			'field !begins static',
 			'field ends static',
-			'field !ends static',
+			'field !ends static'
 		]
 	},
 	fieldA: {
diff --git a/public/dist/application.js b/public/dist/application.js
index 55895bd5..e4ef703d 100644
--- a/public/dist/application.js
+++ b/public/dist/application.js
@@ -334,7 +334,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 	SUBMIT: 'Submit',
 	UPLOAD_FILE: 'Upload your File'
   });
-	
+
 }]);
 
 'use strict';
@@ -1276,7 +1276,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
 
 angular.module('users').controller('PasswordController', ['$scope', '$stateParams', '$state', 'User',
 	function($scope, $stateParams, $state, User) {
-		
+
 		$scope.error = '';
 
 		// Submit forgotten password account id
@@ -1764,7 +1764,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
         $scope.setForm = function(form){
             $scope.myform = form;
         };
-		
+
         $rootScope.resetForm = function(){
             $scope.myform = Forms.get({
                 formId: $stateParams.formId
@@ -2249,8 +2249,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 
 				// LOGIC JUMP METHODS
 				$scope.removeLogicJump = function (field_index) {
-					var currField = $scope.myform.form_fields[field_index];
-					currField.logicJump = {};
+					$scope.myform.form_fields[field_index] = {};
 				};
 
 				$scope.addNewLogicJump = function (field_index) {
@@ -2480,7 +2479,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 						/*
 						 ** Analytics Functions
 						 */
-						
+
 						$scope.AverageTimeElapsed = (function(){
 							var totalTime = 0;
 							var numSubmissions = $scope.table.rows.length;
@@ -2681,15 +2680,15 @@ angular.module('forms').service('FormFields', [
 		    // },
 		    // {
 		    //     name : 'stripe',
-		    //     value : 'Payment' 
+		    //     value : 'Payment'
 		    // },
 		    {
 		        name : 'statement',
-		        value : 'Statement' 
+		        value : 'Statement'
 		    }
 		];
 	}
-		
+
 ]);
 
 'use strict';
@@ -2702,7 +2701,7 @@ angular.module('forms').factory('Submissions', ['$resource',
 			formId: '@_id'
 		}, {
 			'query' : {
-				method: 'GET', 
+				method: 'GET',
 				isArray: true,
 			},
 			'update': {
@@ -2987,7 +2986,7 @@ angular.module('forms').directive('onFinishRender', ["$rootScope", "$timeout", f
     return {
         restrict: 'A',
         link: function (scope, element, attrs) {
-			
+
             //Don't do anything if we don't have a ng-repeat on the current element
             if(!element.attr('ng-repeat') && !element.attr('data-ng-repeat')){
                 return;
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
index b4de84de..fa104c41 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
@@ -315,13 +315,13 @@
 								<div class="col-md-4 col-xs-12 field-input">{{ 'ADD_LOGIC_JUMP' | translate }}</div>
 								<div class="col-md-8 col-xs-12 field-input">
 									<label class="btn col-xs-5">
-										<input type="radio" ng-checked="!!myform.form_fields[$index].logicJump.fieldA"
+										<input type="radio" ng-checked="!!myform.form_fields[$index].logicJump.valueB"
 											   name="logicJumpYes{{field._id}}" ng-click="addNewLogicJump($index)"/>
 										<span> &nbsp; {{ 'YES' | translate }}</span>
 									</label>
 
 									<label class="btn col-xs-5 col-xs-offset-1">
-										<input type="radio" ng-checked="!myform.form_fields[$index].logicJump.fieldA"
+										<input type="radio" ng-checked="!myform.form_fields[$index].logicJump.valueB"
 											   name="logicJumpNo{{field._id}}" ng-click="removeLogicJump($index)"/>
 										<span> &nbsp; {{ 'NO' | translate }}</span>
 									</label>