From a0f7d5e3dfef9f2731d3d030c8cecfb8b1bb78a2 Mon Sep 17 00:00:00 2001 From: Srdjan Jankovic <srdjan@catalyst.net.nz> Date: Thu, 2 Jun 2011 14:26:33 +1200 Subject: [PATCH] bug_6190: BorrowerUnwantedField syspref and removing fields from the patron entry Content-Type: text/plain; charset="utf-8" --- admin/systempreferences.pl | 1 + installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 18 +++- installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + ...m_preferences_full_optimal_for_install_only.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 | 111 +++++++++++++++++++- members/memberentry.pl | 7 ++ xt/syspref.t | 1 + 15 files changed, 153 insertions(+), 5 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/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 6eb67a3..537c52a 100755 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/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','Vater|Mutter','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/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 0abf9d8..d1013c3 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/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index 59a258f..9cb9894 100755 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -19,6 +19,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutomaticItemReturn', '1', 'Ce paramètre permet de faire les retours vers le site propriétaire automatiquement', '', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum', '1', 'Si ce paramètre est activé, le numéro des adhérents est automatiquement calculé. Ne sera pas activé si vous avez des cartes pré-imprimées.', '', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField', '', 'Liste les champs obligatoires dans la grille de saisie des adhérents (séparés par | ou ,)', 'cardnumber|surname|address', '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', '', 'Liste les relations entre les garants et leurs garantis (separées par | ou ,)', 'Père|Mère|grand-parent|Tuteur légal|Autre\r\n', 'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog', '0', 'Activer ce paramètre pour enregistrer les actions sur les lecteurs', '', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersTitles', '', 'Liste les titres de politesse (séparés par | ou ,)', 'M|Mme|Mlle', 'free'); diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql index dcdf0ee..b54cde1 100755 --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql @@ -35,6 +35,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BiblioAddsAuthorities','1','','Se ON, aggiungendo un nuovo record bibliografico il sistema controlla se ci sono i records di authority corrispondenti per i campi collegati con l’authority. Se non ci sono, gli equivalenti rcords di autority sono creati al volo.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BiblioDefaultView','normal','normal|marc|isbd','Per scegliere la visualizzazione di default della scheda dettagliata nel catalogo; scegliere tra normal, marc o isbd.','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowerMandatoryField','city|surname|cardnumber','','Per decidere quali campi sono obbligatori nell\'account di un utente.','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`, `options`, `explanation`, `type`) values('borrowerRelationship','father|mother','','Definisce la relazione valida tra garante e garanzia (separali con | o ,)','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowersLog','0','','Se ON, logga le azioni di modifica/creazione/cancellazione sui dati utente.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('BorrowersTitles','Sig|Sig.ra|Sig.na','','Definisce i titoli appropriati per gli utenti','free'); diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql index ca71769..1a0f8f9 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql @@ -41,6 +41,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','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','far|mor','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'); @@ -48,6 +49,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casServerUrl', 'https://localhost:8443/cas', 'URL of the cas server', '', 'Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('checkdigit','none','If ON, enable checks on patron cardnumber: none or \"Katipo\" style checks','none|katipo','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('COinSinOPACResults', 1, 'If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo'); @@ -55,6 +57,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); @@ -119,6 +122,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnLog',1,'If ON, enables the circulation (returns) log',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('reviewson',1,'If ON, enables patron reviews of bibliographic records in the OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewerPhoto',1,'If ON, photo of reviewer will be shown beside comments in OPAC','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewer',1,'If ON, name of reviewer will be shown above comments in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SpecifyDueDate',1,'Define whether to display \"Specify Due Date\" form in Circulation','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionHistory','simplified','Define the display preference for serials issue history in OPAC','simplified|full','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionLog',1,'If ON, enables subscriptions log',NULL,'YesNo'); @@ -127,6 +131,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('timeout',12000000,'Inactivity timeout for cookies authentication (in seconds)',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransfersMaxDaysWarning',3,'Define the days before a transfer is suspected of having a problem',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode','Calendar','Choose the method for calculating due date: select Calendar to use the holidays module, and Days to ignore the holidays module','Calendar|Days|Datedue','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseControlNumber',0,'If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('virtualshelves',1,'If ON, enables Lists management','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950AuthorAuthFields','701,702,700','Define the MARC biblio fields for Personal Name Authorities to fill biblio.author',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950NormalizeAuthor',0,'If ON, Personal Name Authorities will replace authors in biblio.author','','YesNo'); @@ -160,6 +165,9 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES -- need AddressType to distinguish between US and other, telephone numbers, maori stuff, sex, nationality, etc. -- LDAP ? required fields? INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WebBasedSelfCheck',0,'If ON, enables the web-based self-check system',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SelfCheckTimeout',120,'Define the number of seconds before the Web-based Self Checkout times out a patron','','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AllowSelfCheckReturns',0,'If enabled, patrons may return items through the Web-based Self Checkout','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SelfCheckHelpMessage','','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchResults',20,'Specify the maximum number of results to display on a page of results',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACnumSearchResults',20,'Specify the maximum number of results to display on a page of results',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('defaultSortField',NULL,'Specify the default field used for sorting','relevance|popularity|call_number|pubdate|acqdate|title|author','Choice'); @@ -173,8 +181,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('emailLibrarianWhenHoldIsPlaced',0,'If ON, emails the librarian whenever a hold is placed',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numReturnedItemsToShow','20','Number of returned items to show on the check-in page',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines). Requires accruefines cronjob.','off|test|production','Choice'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts','10','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ceilingDueDate','','If set, date due will not be past this date. Enter date according to the dateformat System Preference',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat|libsuite8','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free'); @@ -286,6 +292,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','<li><a href="http://worldcat.org/search?q={TITLE}" target="_blank">Andre bibliotek (WorldCat)</a></li>\n<li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Andre databaser (Google Scholar)</a></li>\n<li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&title={TITLE}&st=xl&ac=qr" target="_blank">Nettbutikker (Bookfinder.com)</a></li>','Skriv inn HTML som vil vises i \'Flere søk\'-menyen i detaljvisningen i OPACen. Bruk {TITLE}, {AUTHOR} eller {ISBN} som variabler i URLer. La feltet være tomt for å skru av \'Flere søk\'-menyen.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); @@ -321,3 +328,10 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index 58ba035..42aa704 100755 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/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/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 54c533c..94037be 100755 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -35,6 +35,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','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('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo'); diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index 9f095ab..d835d03 100755 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -34,6 +34,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','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('CataloguingLog',1,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.',NULL,'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..851c509 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.05.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 ac3e1d2..6bfa0df 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 f96c27f..9cf28a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -180,6 +180,7 @@ <legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> <ol> [% UNLESS ( I ) %] + [% UNLESS notitle %] [% IF ( title_cgipopup ) %] <li> [% IF ( mandatorytitle ) %] @@ -193,6 +194,8 @@ </li> [% END %] [% END %] + [% END %] + [% UNLESS nosurname %] <li> [% IF ( mandatorysurname ) %] <label for="surname" class="required"> @@ -207,7 +210,9 @@ [% END %] [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %] </li> + [% END %] [% UNLESS ( I ) %] + [% UNLESS nofirstname %] <li> [% IF ( mandatoryfirstname ) %] <label for="firstname" class="required"> @@ -218,6 +223,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"> @@ -246,6 +253,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"> @@ -257,6 +266,8 @@ [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %] </li> [% END %] + [% END %] + [% UNLESS noothernames %] <li> [% IF ( mandatoryothernames ) %] <label for="othernames" class="required"> @@ -268,7 +279,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 ) %] @@ -287,6 +300,7 @@ <label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" /> [% END %] </li> + [% END %] [% END %] </ol> </fieldset> @@ -321,6 +335,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 ) %] @@ -330,6 +345,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 ) %] @@ -339,6 +356,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> @@ -368,8 +386,10 @@ </fieldset> [% END %] +[% UNLESS noaddress && nocity && nostate %] <fieldset class="rows"> <legend>Main address</legend><ol> + [% UNLESS nostreetnumber %] <li> [% IF ( mandatorystreetnumber ) %] <label for="streetnumber" class="required"> @@ -380,6 +400,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 ) %] @@ -392,6 +414,8 @@ [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] </li> [% END %] + [% END %] + [% UNLESS noaddress %] <li> [% IF ( mandatoryaddress ) %] <label for="address" class="required"> @@ -402,6 +426,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"> @@ -412,6 +438,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"> @@ -436,6 +464,8 @@ [% END %] [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %] </li> + [% END %] + [% UNLESS nostate %] <li> [% IF ( mandatorystate ) %] <label for="state" class="required"> @@ -446,6 +476,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"> @@ -456,7 +488,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"> @@ -467,11 +500,13 @@ <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> +[% END # nostreet && nocity etc group%] <fieldset class="rows" id="memberentry_contact"> <legend>Contact</legend><ol> + [% UNLESS nophone %] <li> [% IF ( mandatoryphone ) %] <label for="phone" class="required"> @@ -483,6 +518,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"> @@ -493,6 +530,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"> @@ -503,6 +542,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"> @@ -514,6 +555,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"> @@ -524,6 +567,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"> @@ -534,6 +579,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> @@ -542,8 +588,10 @@ [% END %] [% IF ( step_6 ) %] + [% UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] <fieldset class="rows" id="memberentry_address"> <legend>Alternate address</legend><ol> + [% UNLESS noB_address %] <li> [% IF ( mandatoryB_address ) %] <label for="B_address" class="required"> @@ -554,6 +602,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"> @@ -564,6 +614,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" > @@ -574,6 +626,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" > @@ -584,6 +638,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"> @@ -594,6 +650,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"> @@ -604,6 +662,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"> @@ -614,6 +674,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"> @@ -623,6 +685,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"> @@ -633,12 +697,16 @@ <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea> [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %] </li> + [% END %] </ol> </fieldset> + [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] [% END %] [% IF ( step_2 ) %] + [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactphone %] <fieldset class="rows" id="memberentry_altaddress"> <legend>Alternate Contact</legend><ol> + [% UNLESS noaltcontactsurname %] <li> [% IF ( mandatoryaltcontactsurname ) %] <label for="altcontactsurname" class="required"> @@ -649,6 +717,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"> @@ -659,6 +729,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"> @@ -669,6 +741,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"> @@ -679,6 +753,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"> @@ -689,6 +765,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"> @@ -699,6 +777,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"> @@ -709,6 +789,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"> @@ -719,6 +801,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"> @@ -729,8 +813,10 @@ <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> + [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] [% IF ( I ) %] @@ -757,6 +843,7 @@ <fieldset class="rows" id="memberentry_library_management"> <legend>Library Management</legend><ol> + [% UNLESS nocardnumber %] <li> [% IF ( mandatorycardnumber ) %] <label for="cardnumber" class="required"> [% ELSE %] @@ -765,6 +852,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"> @@ -775,6 +864,7 @@ [% CGIbranch %] [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %] </li> + [% END %] <li> <label for="categorycode">Category: </label> <select id="categorycode" name="categorycode"> @@ -800,6 +890,7 @@ [% END %] </select> </li> + [% UNLESS nosort1 %] <li> [% IF ( mandatorysort1 ) %] <label for="sort1" class="required"> @@ -814,6 +905,8 @@ [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %] [% END %] </li> + [% END %] + [% UNLESS nosort2 %] <li> [% IF ( mandatorysort2 ) %] <label for="sort2" class="required"> @@ -828,10 +921,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"> @@ -854,6 +949,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"> @@ -876,6 +973,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"> @@ -887,6 +986,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"> @@ -898,10 +999,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/Staff Login</legend><ol> + [% UNLESS nouserid %] <li> [% IF ( mandatoryuserid ) %] <label for="userid" class="required"> @@ -948,7 +1051,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 f6ca2c1..f6e96d8 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 ); diff --git a/xt/syspref.t b/xt/syspref.t index 1b7c438..7b1fb76 100755 --- a/xt/syspref.t +++ b/xt/syspref.t @@ -33,6 +33,7 @@ my @trans_syspref_files = qw( uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql pl-PL/mandatory/sysprefs.sql + nb-NO/1-Obligatorisk/sysprefs.sql ); ok( -- 1.7.4.1