From ef9265576c4f6ae9bf077ebebeda05237322e1e6 Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Wed, 15 Nov 2017 11:19:43 -0800
Subject: [PATCH] removed complex form save logic

---
 app/models/form.server.model.js                      |  9 +++++++++
 app/tests/form_submission.model.test.js              |  2 ++
 public/modules/forms/admin/css/admin-form.css        | 12 ++++++------
 .../directiveViews/form/edit-form.client.view.html   |  3 +--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 9bfdcadc..1f3bea12 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -264,6 +264,14 @@ function formFieldsAllHaveIds(form_fields){
 	return true;
 }
 
+FormSchema.pre('save', function (next) {
+	this.form_fields = this.form_fields.filter(function(field){
+		return !field.deletePreserved;
+	});
+	next();
+});
+
+/*
 FormSchema.pre('save', function (next) {
 	var that = this;
 	var _original;
@@ -374,6 +382,7 @@ FormSchema.pre('save', function (next) {
 		next();
 	});
 });
+*/
 
 FormSchema.index({created: 1});
 
diff --git a/app/tests/form_submission.model.test.js b/app/tests/form_submission.model.test.js
index 262fbf04..b857e9a9 100644
--- a/app/tests/form_submission.model.test.js
+++ b/app/tests/form_submission.model.test.js
@@ -176,6 +176,7 @@ describe('FormSubmission Model Unit Tests:', function() {
 		});
 	});
 
+	/*
 	describe('Test FormField and Submission Logic', function() {
 
 		beforeEach(function(done){
@@ -245,6 +246,7 @@ describe('FormSubmission Model Unit Tests:', function() {
 			});
 		});
 	});
+	*/
 
 	afterEach(function(done) {
 		Form.remove().exec(function() {
diff --git a/public/modules/forms/admin/css/admin-form.css b/public/modules/forms/admin/css/admin-form.css
index 2f417375..7daa2b21 100644
--- a/public/modules/forms/admin/css/admin-form.css
+++ b/public/modules/forms/admin/css/admin-form.css
@@ -112,30 +112,30 @@
 /*
 ** Edit Modal
 */
-.admin-form .edit-modal-window .modal-dialog {
+.edit-modal-window .modal-dialog {
 	width: 90%;
 }
 
-.admin-form .edit-modal-window .modal-body {
+.edit-modal-window .modal-body {
 	padding: 0;
 }
 
-.admin-form .edit-modal-window .edit-panel {
+.edit-modal-window .edit-panel {
 	background-color: #F1F1F1;
 	padding: 0 35px 0 35px;
 }
 
-.admin-form .edit-modal-window .preview-field-panel {
+.edit-modal-window .preview-field-panel {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 }
 
-.admin-form .edit-modal-window .preview-field-panel form {
+.edit-modal-window .preview-field-panel form {
 	padding-right: 20px;
 }
 
-.admin-form .edit-modal-window .preview-field {
+.edit-modal-window .preview-field {
 	resize: vertical;
 }
 
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 e8734cd2..fb779350 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
@@ -186,7 +186,6 @@
 		</div>
 	</script>
 
-
 	<!-- Edit EndPage Modal Dialog Template -->
 	<script type="text/ng-template" id="editEndPageModal.html" class="edit-endpage-modal">
 		<div class="modal-body">
@@ -527,7 +526,7 @@
 
             <div class="panel-group dropzone col-xs-12" ui-sortable="sortableOptions" ng-model="myform.form_fields">
 
-            	<div class="col-xs-12 field-row" ng-repeat="field in myform.form_fields track by $id($index)" ng-if="!field.deletePreserved">
+            	<div class="col-xs-12 field-row" ng-repeat="field in myform.form_fields track by $index" ng-hide="field.deletePreserved">
 	            	<div class="col-xs-10">
 			            <div class="panel panel-default" ng-click="openEditModal(field, true, $index)">
 			                <div class="panel-heading">