Bugzilla – Attachment 3919 Details for
Bug 6190
Custom field removal from patron entry screens
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
0001-bug_6190-BorrowerUnwantedField-syspref-and-removing-.patch (text/plain), 26.33 KB, created by
Srdjan Jankovic
on 2011-04-14 06:03:34 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Srdjan Jankovic
Created:
2011-04-14 06:03:34 UTC
Size:
26.33 KB
patch
obsolete
>From 7881272cbb3d02f4d182fa7586a006bb8ac3dada Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Thu, 14 Apr 2011 18:01:07 +1200 >Subject: [PATCH] bug_6190: BorrowerUnwantedField syspref and removing fields from the > patron entry > >--- > admin/systempreferences.pl | 1 + > installer/data/mysql/en/mandatory/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 ++ > .../prog/en/modules/admin/preferences/patrons.pref | 5 + > .../prog/en/modules/help/members/memberentry.tt | 1 + > .../prog/en/modules/members/memberentrygen.tt | 105 +++++++++++++++++++- > members/memberentry.pl | 7 ++ > 7 files changed, 124 insertions(+), 3 deletions(-) > >diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl >index 87ecac4..39a81e6 100755 >--- a/admin/systempreferences.pl >+++ b/admin/systempreferences.pl >@@ -223,6 +223,7 @@ $tabsysprefs{intranetreadinghistory} = "Patrons"; > $tabsysprefs{NotifyBorrowerDeparture} = "Patrons"; > $tabsysprefs{memberofinstitution} = "Patrons"; > $tabsysprefs{BorrowerMandatoryField} = "Patrons"; >+$tabsysprefs{BorrowerUnwantedField} = "Patrons"; > $tabsysprefs{borrowerRelationship} = "Patrons"; > $tabsysprefs{BorrowersTitles} = "Patrons"; > $tabsysprefs{patronimages} = "Patrons"; >diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql >index 8c94d08..a4381bb 100755 >--- a/installer/data/mysql/en/mandatory/sysprefs.sql >+++ b/installer/data/mysql/en/mandatory/sysprefs.sql >@@ -20,6 +20,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free'); >+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 3baefc8..0c3abf7 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -4310,6 +4310,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > SetVersion ($DBversion); > } > >+$DBversion = "3.03.00.XXX"; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free')"); >+ print "Upgrade to $DBversion done (BorrowerUnwantedField syspref)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 DropAllForeignKeys($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >index 9b5d540..b03978d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >@@ -32,6 +32,11 @@ Patrons: > class: multi > - (separate columns with |) > - >+ - "The following database columns will not appear on the patron entry screen:" >+ - pref: BorrowerUnwantedField >+ class: multi >+ - (separate columns with |) >+ - > - "Guarantors can be the following of those they guarantee:" > - pref: borrowerRelationship > class: multi >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt >index b832f4c..9dcaf60 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt >@@ -22,6 +22,7 @@ > <li>Enter the identifying information regarding your patron > <ul> > <li>Required fields are defined in the BorrowerMandatoryField system preference</li> >+ <li>Unwanted fields are defined in the BorrowerUnwantedField system preference</li> > <li>Salutation is populated by the BorrowersTitles system preference</li> > </ul> > </li> >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 ac4e5f2..bfb2568 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -169,6 +169,7 @@ > <legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> > <ol> > [% UNLESS ( I ) %] >+ [% UNLESS nobtitle %] > [% IF ( title_cgipopup ) %] > <li> > [% IF ( mandatorytitle ) %] >@@ -182,6 +183,8 @@ > </li> > [% END %] > [% END %] >+ [% END %] >+ [% UNLESS nosurname %] > <li> > [% IF ( mandatorysurname ) %] > <label for="surname" class="required"> >@@ -196,7 +199,9 @@ > [% END %] > [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > [% UNLESS ( I ) %] >+ [% UNLESS nofirstname %] > <li> > [% IF ( mandatoryfirstname ) %] > <label for="firstname" class="required"> >@@ -207,6 +212,8 @@ > <input type="text" id="firstname" name="firstname" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" /> > [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nodateofbirth %] > <li> > [% IF ( mandatorydateofbirth ) %] > <label for="dateofbirth" class="required"> >@@ -235,6 +242,8 @@ > [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %] > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> >+ [% END %] >+ [% UNLESS noinitials %] > <li> > [% IF ( mandatoryinitials ) %] > <label for="initials" class="required"> >@@ -246,6 +255,8 @@ > [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >+ [% END %] >+ [% UNLESS noothernames %] > <li> > [% IF ( mandatoryothernames ) %] > <label for="othernames" class="required"> >@@ -257,7 +268,9 @@ > [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %] > [% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %] > </li> >+ [% END %] > [% UNLESS ( I ) %] >+ [% UNLESS nosex %] > <li class="radio"> > > [% IF ( female ) %] >@@ -276,6 +289,7 @@ > <label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" /> > [% END %] > </li> >+ [% END %] > [% END %] > </ol> > </fieldset> >@@ -310,6 +324,7 @@ > [% END %] > <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %] > </li> >+ [% UNLESS nocontactname %] > <li> > <label for="contactname">Surname: </label> > [% IF ( guarantorid ) %] >@@ -319,6 +334,8 @@ > <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% END %] > </li> >+ [% END %] >+ [% UNLESS nocontactfirstname %] > <li> > <label for="contactfirstname">First name: </label> > [% IF ( guarantorid ) %] >@@ -328,6 +345,7 @@ > <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% END %] > </li> >+ [% END %] > [% IF ( relshiploop ) %] > <li> > <label for="relationship">Relationship: </label> >@@ -359,6 +377,7 @@ > [% END %] > <fieldset class="rows"> > <legend>Main address</legend><ol> >+ [% UNLESS nostreetnumber %] > <li> > [% IF ( mandatorystreetnumber ) %] > <label for="streetnumber" class="required"> >@@ -369,6 +388,8 @@ > <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nostreettype %] > [% IF ( road_cgipopup ) %] > <li> > [% IF ( mandatorystreettype ) %] >@@ -381,6 +402,8 @@ > [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >+ [% END %] >+ [% UNLESS noaddress %] > <li> > [% IF ( mandatoryaddress ) %] > <label for="address" class="required"> >@@ -391,6 +414,8 @@ > <input type="text" id="address" name="address" size="35" value="[% address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaddress2 %] > <li> > [% IF ( mandatoryaddress2 ) %] > <label for="address2" class="required"> >@@ -401,6 +426,8 @@ > <input type="text" id="address2" name="address2" size="35" value="[% address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nocity %] > <li> > [% IF ( mandatorycity ) %] > <label for="city" class="required"> >@@ -425,6 +452,8 @@ > [% END %] > [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nostate %] > <li> > [% IF ( mandatorystate ) %] > <label for="state" class="required"> >@@ -435,6 +464,8 @@ > <input type="text" name="state" id="state" size="20" value="[% state %]" /> > [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nozipcode %] > <li> > [% IF ( mandatoryzipcode ) %] > <label for="zipcode" class="required"> >@@ -445,7 +476,8 @@ > <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %] > </li> >- >+ [% END %] >+ [% UNLESS nocountry %] > <li> > [% IF ( mandatorycountry ) %] > <label for="country" class="required"> >@@ -456,11 +488,12 @@ > <input type="text" name="country" id="country" size="20" value="[% country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %] > </li> >- >+ [% END %] > </ol> > </fieldset> > <fieldset class="rows" id="memberentry_contact"> > <legend>Contact</legend><ol> >+ [% UNLESS nophone %] > <li> > [% IF ( mandatoryphone ) %] > <label for="phone" class="required"> >@@ -472,6 +505,8 @@ > [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> >+ [% END %] >+ [% UNLESS nophonepro %] > <li> > [% IF ( mandatoryphonepro ) %] > <label for="phonepro" class="required"> >@@ -482,6 +517,8 @@ > <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nomobile %] > <li> > [% IF ( mandatorymobile ) %] > <label for="mobile" class="required"> >@@ -492,6 +529,8 @@ > <input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noemail %] > <li> > [% IF ( mandatoryemail ) %] > <label for="email" class="required"> >@@ -503,6 +542,8 @@ > [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> >+ [% END %] >+ [% UNLESS noemailpro %] > <li> > [% IF ( mandatoryemailpro ) %] > <label for="emailpro" class="required"> >@@ -513,6 +554,8 @@ > <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nofax %] > <li> > [% IF ( mandatoryfax ) %] > <label for="fax" class="required"> >@@ -523,6 +566,7 @@ > <input type="text" id="fax" name="fax" value="[% fax %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > </ol> > </fieldset> > >@@ -533,6 +577,7 @@ > > <fieldset class="rows" id="memberentry_address"> > <legend>Alternate address</legend><ol> >+ [% UNLESS noB_address %] > <li> > [% IF ( mandatoryB_address ) %] > <label for="B_address" class="required"> >@@ -543,6 +588,8 @@ > <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_address2 %] > <li> > [% IF ( mandatoryB_address2 ) %] > <label for="B_address2" class="required"> >@@ -553,6 +600,8 @@ > <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_city %] > <li> > [% IF ( mandatoryB_city ) %] > <label for="B_city" class="required" > >@@ -563,6 +612,8 @@ > <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" /> > [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_state %] > <li> > [% IF ( mandatoryB_state ) %] > <label for="B_state" class="required" > >@@ -573,6 +624,8 @@ > <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" /> > [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_zipcode %] > <li> > [% IF ( mandatoryB_zipcode ) %] > <label for="B_zipcode" class="required"> >@@ -583,6 +636,8 @@ > <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_country %] > <li> > [% IF ( mandatoryB_country ) %] > <label for="B_country" class="required"> >@@ -593,6 +648,8 @@ > <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_phone %] > <li> > [% IF ( mandatoryB_phone ) %] > <label for="B_phone" class="required"> >@@ -603,6 +660,8 @@ > <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noB_email %] > <li> > [% IF ( mandatoryB_email ) %] > <label for="B_email" class="required"> >@@ -612,6 +671,8 @@ > Email: </label> > <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li> >+ [% END %] >+ [% UNLESS nocontactnote %] > <li> > [% IF ( mandatorycontactnote ) %] > <label for="contactnote" class="required"> >@@ -622,12 +683,14 @@ > <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea> > [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > </ol> > </fieldset> > [% END %] > [% IF ( step_2 ) %] > <fieldset class="rows" id="memberentry_altaddress"> > <legend>Alternate Contact</legend><ol> >+ [% UNLESS noaltcontactsurname %] > <li> > [% IF ( mandatoryaltcontactsurname ) %] > <label for="altcontactsurname" class="required"> >@@ -638,6 +701,8 @@ > <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactfirstname %] > <li> > [% IF ( mandatoryaltcontactfirstname ) %] > <label for="altcontactfirstname" class="required"> >@@ -648,6 +713,8 @@ > <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactaddress1 %] > <li> > [% IF ( mandatoryaltcontactaddress1 ) %] > <label for="altcontactaddress1" class="required"> >@@ -658,6 +725,8 @@ > <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" /> > [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactaddress2 %] > <li> > [% IF ( mandatoryaltcontactaddress2 ) %] > <label for="altcontactaddress2" class="required"> >@@ -668,6 +737,8 @@ > <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" /> > [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactaddress3 %] > <li> > [% IF ( mandatoryaltcontactaddress3 ) %] > <label for="altcontactaddress3" class="required"> >@@ -678,6 +749,8 @@ > <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" /> > [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactstate %] > <li> > [% IF ( mandatoryaltcontactstate ) %] > <label for="altcontactstate" class="required"> >@@ -688,6 +761,8 @@ > <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" /> > [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactzipcode %] > <li> > [% IF ( mandatoryaltcontactzipcode ) %] > <label for="altcontactzipcode" class="required"> >@@ -698,6 +773,8 @@ > <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="5" /> > [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactcountry %] > <li> > [% IF ( mandatoryaltcontactcountry ) %] > <label for="altcontactcountry" class="required"> >@@ -708,6 +785,8 @@ > <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="20" /> > [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noaltcontactphone %] > <li> > [% IF ( mandatoryaltcontactphone ) %] > <label for="altcontactphone" class="required"> >@@ -718,6 +797,7 @@ > <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] /> > [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > </ol> > </fieldset> > >@@ -746,6 +826,7 @@ > > <fieldset class="rows" id="memberentry_library_management"> > <legend>Library Management</legend><ol> >+ [% UNLESS nocardnumber %] > <li> [% IF ( mandatorycardnumber ) %] > <label for="cardnumber" class="required"> > [% ELSE %] >@@ -754,6 +835,8 @@ > Card number: </label> > <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% cardnumber %][% END %]" /> > [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li> >+ [% END %] >+ [% UNLESS nobranchcode %] > <li> > [% IF ( mandatorybranchcode ) %] > <label for="branchcode" class="required"> >@@ -764,6 +847,7 @@ > [% CGIbranch %] > [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > <li> > <label for="categorycode">Category: </label> > <select id="categorycode" name="categorycode"> >@@ -789,6 +873,7 @@ > [% END %] > </select> > </li> >+ [% UNLESS nosort1 %] > <li> > [% IF ( mandatorysort1 ) %] > <label for="sort1" class="required"> >@@ -803,6 +888,8 @@ > [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %] > [% END %] > </li> >+ [% END %] >+ [% UNLESS nosort2 %] > <li> > [% IF ( mandatorysort2 ) %] > <label for="sort2" class="required"> >@@ -817,10 +904,12 @@ > [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %] > [% END %] > </li> >+ [% END %] > </ol> > </fieldset> > <fieldset class="rows" id="memberentry_subscription"> > <legend>Library set-up</legend><ol> >+ [% UNLESS nodateenrolled %] > <li> > [% IF ( mandatorydateenrolled ) %] > <label for="dateenrolled" class="required"> >@@ -843,6 +932,8 @@ > [% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %] > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> >+ [% END %] >+ [% UNLESS nodateexpiry %] > <li> > [% IF ( mandatorydateexpiry ) %] > <label for="dateexpiry" class="required"> >@@ -865,6 +956,8 @@ > [% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %] > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> >+ [% END %] >+ [% UNLESS noopacnote %] > <li> > [% IF ( mandatoryopacnote ) %] > <label for="opacnote" class="required"> >@@ -876,6 +969,8 @@ > <div class="hint">This message appears on this patron's user page in the OPAC</div> > [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS noborrowernotes %] > <li> > [% IF ( mandatoryborrowernotes ) %] > <label for="borrowernotes" class="required"> >@@ -887,10 +982,12 @@ > <div class="hint">This message displays when checking out to this patron</div> > [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > </ol> > </fieldset> > <fieldset class="rows" id="memberentry_userid"> > <legend>OPAC login</legend><ol> >+ [% UNLESS nouserid %] > <li> > [% IF ( mandatoryuserid ) %] > <label for="userid" class="required"> >@@ -937,7 +1034,9 @@ > [% END %] > [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %] > [% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %] >- </li></ol> >+ </li> >+ [% END %] >+ </ol> > </fieldset> > <!--this zones are not necessary in modif mode --> > [% UNLESS ( opadd ) %] >diff --git a/members/memberentry.pl b/members/memberentry.pl >index c665b6e..567bb3f 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -100,6 +100,13 @@ my @field_check=split(/\|/,$check_BorrowerMandatoryField); > foreach (@field_check) { > $template->param( "mandatory$_" => 1); > } >+# function to designate unwanted fields >+my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField"); >+@field_check=split(/\|/,$check_BorrowerUnwantedField); >+foreach (@field_check) { >+ next unless m/\w/o; >+ $template->param( "no$_" => 1); >+} > $template->param( "add" => 1 ) if ( $op eq 'add' ); > $template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' ); > $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 ); >-- >1.6.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6190
:
3919
|
4004
|
4062
|
4071
|
4080
|
4337
|
4481
|
4799
|
4800
|
4976
|
5308
|
5818
|
5837
|
6303