Attachment 103846 Details for Bug 22844 – Bug 22844: Make the attribute mandatory when editing a patron

[patch] Bug 22844: Make the attribute mandatory when editing a patron

Bug-22844-Make-the-attribute-mandatory-when-editin.patch (text/plain), 6.85 KB, created by Jonathan Druart on 2020-04-28 11:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-04-28 11:21:38 UTC

Size: 6.85 KB

patch

obsolete

>From 37ee826a42b36fbe70b197539e05fbd44782e7c3 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 17 May 2019 09:30:02 -0500
>Subject: [PATCH] Bug 22844: Make the attribute mandatory when editing a patron
>
>Note: I am not confident with this patch, I think it's not polished. I
>will not have time to improve it to make it ready for 19.05.00
>1. Conflict with bug 20443 (which would have make this change way much
>easier!)
>2. It does not work :) You will be able to submit the memberentry form
>even if the patron attribute is marked as mandatory (??)
>3. What about the OPAC?
>4. What about repeatable fields? We certainly will need JS code here
>5. What about the "Quick add" feature? (I had trouble in the past to not
>introduce regression when we played with this template...)
>
>Do not forget to run updatedatabase.pl and regenerate DBIC schema if you
>want to play with this patchset.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Bug 22844: (follow-up) Make the attribute mandatory when editing a patron
>
>Previous patch forgot the most important, adding the required attribute
>to the select/textarea
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../prog/en/modules/members/memberentrygen.tt | 19 +++++++++++++++----
> members/memberentry.pl                        |  1 +
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 4b5eb35d12..b3f9236acc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1343,11 +1343,17 @@ legend:hover {
>                                                     [% END %]
>                                                     [% FOREACH patron_attribute IN pa_loo.items %]
>                                                         <li data-category_code="[% patron_attribute.category_code | html %]">
>-                                                            <label for="[% patron_attribute.form_id | html %]">
>-                                                                [% patron_attribute.description | html %]:
>-                                                            </label>
>+                                                            [% IF patron_attribute.mandatory %]
>+                                                                <label for="[% patron_attribute.form_id | html %]" class="required" required="required">[% patron_attribute.description | html %]: </label>
>+                                                            [% ELSE %]
>+                                                                <label for="[% patron_attribute.form_id | html %]">[% patron_attribute.description | html %]: </label>
>+                                                            [% END %]
>                                                             [% IF ( patron_attribute.use_dropdown ) %]
>-                                                                <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">
>+                                                                [% IF patron_attribute.mandatory %]
>+                                                                    <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" required="required">
>+                                                                [% ELSE %]
>+                                                                    <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">
>+                                                                [% END %]
>                                                                     <option value=""></option>
>                                                                     [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
>                                                                         [% IF auth_val_loo.authorised_value == patron_attribute.value %]
>@@ -1362,13 +1368,18 @@ legend:hover {
>                                                                     [% END %]
>                                                                 </select>
>                                                             [% ELSE %]
>+                                                                [% IF patron_attribute.mandatory %]
>+                                                                <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" required="required">[% patron_attribute.value | html %]</textarea>
>+                                                                [% ELSE %]
>                                                                 <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">[% patron_attribute.value | html %]</textarea>
>+                                                                [% END %]
>                                                             [% END # /IF ( patron_attribute.use_dropdown ) %]
>                                                             <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_code" value="[% patron_attribute.code | html %]" />
>                                                             <a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash"></i> Clear</a>
>                                                             [% IF ( patron_attribute.repeatable ) %]
>                                                                 <a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
>                                                             [% END %]
>+                                                            [% IF patron_attribute.mandatory %]<span class="required">Required</span>[% END %]
>                                                         </li>
>                                                     [% END # /FOREACH patron_attribute %]
>                                                     [% IF pa_loo.class %]</fieldset>[% END %]
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 72cbda5895..96d36aee2d 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -891,6 +891,7 @@ sub patron_attributes_form {
>             repeatable        => $attr_type->repeatable(),
>             category          => $attr_type->authorised_value_category(),
>             category_code     => $attr_type->category_code(),
>+            mandatory         => $attr_type->mandatory(),
>         };
>         if (exists $attr_hash{$attr_type->code()}) {
>             foreach my $attr (@{ $attr_hash{$attr_type->code()} }) {
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22844: 89322 | 89323 | 89389 | 89403 | 89530 | 89531 | 89749 | 89903 | 89904 | 89905 | 90407 | 96007 | 98145 | 98146 | 98147 | 98148 | 98149 | 98150 | 98151 | 98297 | 98298 | 100440 | 100441 | 100442 | 100443 | 100444 | 100445 | 100446 | 100447 | 101198 | 101199 | 101200 | 101201 | 101202 | 101203 | 101204 | 101205 | 101302 | 101480 | 101481 | 101482 | 101483 | 101484 | 101485 | 101486 | 101487 | 101488 | 101617 | 101618 | 101619 | 101620 | 101621 | 101622 | 101623 | 101624 | 103842 | 103843 | 103844 | 103845 | 103846 | 103847 | 103848 | 103849 | 103850 | 103904 | 103960 | 103961 | 103962 | 103963 | 103964 | 103965 | 103966 | 103967 | 103968 | 103969 | 106545 | 106546 | 106547 | 106548 | 106549 | 106550 | 106551 | 106552 | 106553 | 106554 | 107126