From ab830fdc9e4bf478797278c9202a4f1920620ff5 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 15 Nov 2017 09:41:19 -0800 Subject: [PATCH] fixed form footer toggle in config general admin panel --- app/controllers/forms.server.controller.js | 4 ++-- app/models/form.server.model.js | 4 ++-- .../views/directiveViews/form/submit-form.client.view.html | 2 +- .../forms/admin/views/adminTabs/configureTabs/general.html | 2 +- .../unit/directives/configure-form.client.directive.test.js | 2 +- .../directives/edit-form-submissions.client.directive.test.js | 2 +- .../tests/unit/directives/edit-form.client.directive.test.js | 2 +- .../unit/directives/submit-form.client.directive.test.js | 2 +- public/swagger.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index fdc472b9..f39b7b8e 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -514,7 +514,7 @@ exports.formByID = function(req, res, next, id) { } Form.findById(id) - .select('admin title language form_fields startPage endPage hideFooter isLive design analytics.gaCode respondentNotifications selfNotifications') + .select('admin title language form_fields startPage endPage showFooter isLive design analytics.gaCode respondentNotifications selfNotifications') .populate('admin') .exec(function(err, form) { if (err) { @@ -543,7 +543,7 @@ exports.formByIDFast = function(req, res, next, id) { } Form.findById(id) .lean() - .select('title language form_fields startPage endPage hideFooter isLive design analytics.gaCode selfNotifications respondentNotifications') + .select('title language form_fields startPage endPage showFooter isLive design analytics.gaCode selfNotifications respondentNotifications') .exec(function(err, form) { if (err) { return next(err); diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index be4e6b5c..9bfdcadc 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -192,9 +192,9 @@ var FormSchema = new Schema({ } }, - hideFooter: { + showFooter: { type: Boolean, - default: false + default: true }, isLive: { diff --git a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html index 4a85cb36..8b065343 100755 --- a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html +++ b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html @@ -72,7 +72,7 @@ -
+
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html index acbf3298..5f3f8145 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html @@ -71,7 +71,7 @@
diff --git a/public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js b/public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js index d4388481..627c38c1 100644 --- a/public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js @@ -31,7 +31,7 @@ startPage: { showStart: false }, - hideFooter: false, + showFooter: false, isGenerated: false, isLive: false, autofillPDFs: false, diff --git a/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js b/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js index 75ac6b0d..9c23301a 100644 --- a/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js @@ -59,7 +59,7 @@ endPage: { showEnd: false }, - hideFooter: false, + showFooter: false, isGenerated: false, isLive: false, _id: '525a8422f6d0f87f0e407a33' diff --git a/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js b/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js index 5ad0047b..c6bca9d4 100644 --- a/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js @@ -32,7 +32,7 @@ showStart: false, buttons: [] }, - hideFooter: false, + showFooter: false, isGenerated: false, isLive: false, _id: '525a8422f6d0f87f0e407a33' diff --git a/public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js b/public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js index f3c055a4..6c7cb783 100644 --- a/public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js +++ b/public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js @@ -52,7 +52,7 @@ var MobileDetect = function(userAgentStr){ startPage: { showStart: false }, - hideFooter: false, + showFooter: false, isGenerated: false, isLive: false, autofillPDFs: false, diff --git a/public/swagger.json b/public/swagger.json index 37a4fdf3..44bdb810 100644 --- a/public/swagger.json +++ b/public/swagger.json @@ -811,7 +811,7 @@ } } }, - "hideFooter": { + "showFooter": { "type": "boolean", "default": false, "description": "Specifies whether to hide or show Form Footer",