From 7eb3fc2738dcc02e48ed07305acd0a882a0699bd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 17 Mar 2016 09:08:39 -0400 Subject: [PATCH] Bug 16047 [Follow-up] Software error on deleting a group with no category code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit df127ebad814ad1710b161b85a69d408de95de85) Signed-off-by: Julian Maurice (cherry picked from commit c514e1fee2890660caa36c1dae62bcfbc6f72fc3) Signed-off-by: Frédéric Demians --- .../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 7d28a63d2b..f7c768e8d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -308,7 +308,7 @@ tinyMCE.init({ [% IF ( editcategory ) %]

[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]Add group[% END %]

-
+ [% IF ( categorycode ) %] @@ -323,14 +323,15 @@ tinyMCE.init({ [% categorycode %] [% ELSE %] - + Required [% END %]
  • - - + + + Required
  • @@ -358,7 +359,10 @@ tinyMCE.init({
  • -
    +
    + + Cancel +
    [% END %] -- 2.39.5