From e162de9a6a6406cc539a991c8393d1770230902e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 17 Mar 2016 09:08:39 -0400 Subject: [PATCH] [PASSED QA] Bug 16047 [Follow-up] Software error on deleting a group with no category code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follow-up take the original patch a little further, making category name required on the entry form as well. Without a category name there is no label in the interface when selecting a category. That doens't make any sense. Also changed on the group entry form: - Added "required" attribute to labels on required fields. - Changed "Update" submit button label to "Submit." - Added a "Cancel" link. - Added the "validated" class to the form so that our built-in validation script will process it (not strictly necessary but makes the validation appearance more consistent). Followed test plan, form displays and behaves as expected. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index b3e71f3..aceec04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -323,7 +323,7 @@ tinyMCE.init({ [% IF op == 'add_form_category' %]

[% IF category.categorycode %]Edit group [% category.categorycode %][% ELSE %]Add group[% END %]

-
+ [% IF category.categorycode %] @@ -336,14 +336,15 @@ tinyMCE.init({ [% category.categorycode %] [% ELSE %] - + Required [% END %]
  • - - + + + Required
  • @@ -372,7 +373,10 @@ tinyMCE.init({
  • -
    +
    + + Cancel +
    [% END %] -- 1.9.1