From dd6d4f777227bdd7ed24442ad70fda44ba13ea26 Mon Sep 17 00:00:00 2001 From: Marc Veron Date: Wed, 18 Jul 2012 07:57:36 +0200 Subject: [PATCH] Bug 7628 - Required format is not enforced for Patron Categories Enforces category code with allowed characters only. Test plan: - Before applying patch, create a category code like Test+ - Try to delete category with this code -> does not work - Apply patch - Try to create category with code containg other characters than letters, numbers, - and _ - Result: You are not allowed to do so, appropriate message pops up Signed-off-by: David Cook Signed-off-by: Chris Cormack (cherry picked from commit 601228f6585b6b942a31a8cfa642216925b09148) Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/admin/categorie.tt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index d2c353e1f9..d85336c7cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -52,10 +52,18 @@ var ok=0; var _alertString=_("Form not submitted because of the following problem(s)"); _alertString +="\n-------------------------------------------------------------------\n\n"; - if (ff.categorycode.value.length==0) { - ok=1; - _alertString += _("- categorycode missing") + "\n"; - } + ff.categorycode.value = ff.categorycode.value.trim(); + if (ff.categorycode.value.length==0) { + ok=1; + _alertString += _("- categorycode missing") + "\n"; + } + else{ + var patt=/^[a-zA-Z0-9\-_]+$/g; + if ( !patt.test(ff.categorycode.value) ) { + ok=1; + _alertString += _("- category code can only contain the following characters: letters, numbers, - and _") + "\n"; + } + } if (!(ff.category_type.value)){ ok=1; _alertString += _("- category type missing") + "\n"; -- 2.39.5