From 448d7894ff2a5517b1d06cf1ac98370e17509fcf Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 28 Sep 2015 12:50:26 -0400 Subject: [PATCH] #325 Some more progress made on manage permission templates validation --- admin/manage_permission_templates.php | 98 ++++++++++++++++----------- js/validation-scripts.js | 40 +++++++++++ 2 files changed, 99 insertions(+), 39 deletions(-) diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 8c31e968..23dcfed3 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -193,7 +193,7 @@ function createEditModal($template, $features, $categories) aria-labelledby="myLargeModalLabel" aria-hidden="true"> @@ -278,7 +284,9 @@ function createEditModal($template, $features, $categories) @@ -294,7 +302,7 @@ function buildCreateModal($features, $categories) aria-hidden="true"> + diff --git a/js/validation-scripts.js b/js/validation-scripts.js index 7f240e07..40917cf3 100644 --- a/js/validation-scripts.js +++ b/js/validation-scripts.js @@ -35,4 +35,44 @@ function buildValidatorForTicketSubmission(formName, validationText) { multiselect: validationText } }); +} + +function buildValidatorForExistingPermissionTemplate(formId, validationText, templateId) { + $('#' + formId).validator({ + custom: { + checkbox: function($el) { + var checkboxes = $('input[data-modal="' + templateId + '-' + $el.attr('data-checkbox') + '"]'); + + for (var checkbox in checkboxes) { + if (checkboxes[checkbox].checked) { + return true; + } + } + return false; + } + }, + errors: { + checkbox: validationText + } + }); +} + +function buildValidatorForPermissionTemplates(formId, validationText) { + $('#' + formId).validator({ + custom: { + checkbox: function($el) { + var checkboxes = $('input[data-modal="new-' + $el.attr('data-checkbox') + '"]'); + + for (var checkbox in checkboxes) { + if (checkboxes[checkbox].checked) { + return true; + } + } + return false; + } + }, + errors: { + checkbox: validationText + } + }); } \ No newline at end of file