Bugzilla – Attachment 4976 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), 58.11 KB, created by
Srdjan Jankovic
on 2011-08-12 03:37:29 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Srdjan Jankovic
Created:
2011-08-12 03:37:29 UTC
Size:
58.11 KB
patch
obsolete
>From d7e6e76f84dd1fb665d1e7eebd5e65abda917c4a Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Fri, 12 Aug 2011 15:31:14 +1200 >Subject: [PATCH] bug_6190: BorrowerUnwantedField syspref and removing fields from the > patron entry > >--- > admin/systempreferences.pl | 1 + > installer/data/mysql/de-DE/mandatory/sysprefs.sql | 2 +- > installer/data/mysql/en/mandatory/sysprefs.sql | 1 + > installer/data/mysql/es-ES/mandatory/sysprefs.sql | 1 + > .../1-Obligatoire/unimarc_standard_systemprefs.sql | 2 +- > installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + > .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 19 +++- > 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 | 124 +++++++++++++++++++- > members/memberentry.pl | 7 + > xt/syspref.t | 1 + > 16 files changed, 167 insertions(+), 8 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 6df6a9f..8687ed7 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'); >@@ -317,4 +318,3 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo'); >- >diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql >index 8407505..65a5acc 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/es-ES/mandatory/sysprefs.sql b/installer/data/mysql/es-ES/mandatory/sysprefs.sql >index 8407505..7fd4b3a 100755 >--- a/installer/data/mysql/es-ES/mandatory/sysprefs.sql >+++ b/installer/data/mysql/es-ES/mandatory/sysprefs.sql >@@ -317,3 +317,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo'); >+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'); >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 d46502c..032fcbf 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'); >@@ -318,4 +319,3 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo'); >- >diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql >index 3448738..65cfa3e 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 ac4c3e2..044cb0c 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'); >@@ -118,6 +121,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnBeforeExpiry',0,'If ON, checkout will be prevented if returndate is after patron card expiry',NULL,'YesNo'); > 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('ShowReviewer',1,'If ON, name of reviewer will be shown above comments in 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('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'); >@@ -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,6 +328,14 @@ 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'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo'); >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); >diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql >index 3087f3c..9d01cb1 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 c0912ba..66a1576 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 d334469..3a5f191 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 720bd8c..94bc421 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -4399,6 +4399,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 236295d..5c36973 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -178,10 +178,12 @@ > [% END %] > > [% IF ( step_1 ) %] >+[%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] > <fieldset class="rows" id="memberentry_identity"> > <legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> > <ol> > [% UNLESS ( I ) %] >+ [% UNLESS notitle %] > [% IF ( title_cgipopup ) %] > <li> > [% IF ( mandatorytitle ) %] >@@ -195,6 +197,8 @@ > </li> > [% END %] > [% END %] >+ [% END %] >+ [% UNLESS nosurname %] > <li> > [% IF ( mandatorysurname ) %] > <label for="surname" class="required"> >@@ -209,7 +213,9 @@ > [% END %] > [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > [% UNLESS ( I ) %] >+ [% UNLESS nofirstname %] > <li> > [% IF ( mandatoryfirstname ) %] > <label for="firstname" class="required"> >@@ -220,6 +226,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"> >@@ -248,6 +256,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"> >@@ -259,6 +269,8 @@ > [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >+ [% END %] >+ [% UNLESS noothernames %] > <li> > [% IF ( mandatoryothernames ) %] > <label for="othernames" class="required"> >@@ -270,7 +282,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 ) %] >@@ -289,9 +303,11 @@ > <label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" /> > [% END %] > </li> >+ [% END %] > [% END %] > </ol> > </fieldset> >+[% END # hide fieldset %] > > [% IF ( showguarantor ) %]<input type="hidden" id="guarantorid" name="guarantorid" value="[% guarantorid %]" /> > <fieldset class="rows"> >@@ -323,6 +339,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 ) %] >@@ -332,6 +349,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 ) %] >@@ -341,6 +360,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> >@@ -370,8 +390,10 @@ > </fieldset> > > [% END %] >+[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] > <fieldset class="rows"> > <legend>Main address</legend><ol> >+ [% UNLESS nostreetnumber %] > <li> > [% IF ( mandatorystreetnumber ) %] > <label for="streetnumber" class="required"> >@@ -382,6 +404,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 ) %] >@@ -394,6 +418,8 @@ > [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >+ [% END %] >+ [% UNLESS noaddress %] > <li> > [% IF ( mandatoryaddress ) %] > <label for="address" class="required"> >@@ -404,6 +430,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"> >@@ -414,6 +442,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"> >@@ -438,6 +468,8 @@ > [% END %] > [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] >+ [% UNLESS nostate %] > <li> > [% IF ( mandatorystate ) %] > <label for="state" class="required"> >@@ -448,6 +480,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"> >@@ -458,7 +492,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"> >@@ -469,11 +504,15 @@ > <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%] >+ >+[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] > <fieldset class="rows" id="memberentry_contact"> > <legend>Contact</legend><ol> >+ [% UNLESS nophone %] > <li> > [% IF ( mandatoryphone ) %] > <label for="phone" class="required"> >@@ -485,6 +524,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"> >@@ -495,6 +536,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"> >@@ -505,6 +548,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"> >@@ -516,6 +561,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"> >@@ -526,6 +573,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"> >@@ -536,16 +585,19 @@ > <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> >- >+[%END # hide fieldset %] > > <!-- ************************ STEP_1 *********************** --> > [% END %] > [% IF ( step_6 ) %] > >+ [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && 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"> >@@ -556,6 +608,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"> >@@ -566,6 +620,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" > >@@ -576,6 +632,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" > >@@ -586,6 +644,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"> >@@ -596,6 +656,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"> >@@ -606,6 +668,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"> >@@ -616,6 +680,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"> >@@ -625,6 +691,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"> >@@ -635,12 +703,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 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] > <fieldset class="rows" id="memberentry_altaddress"> > <legend>Alternate Contact</legend><ol> >+ [% UNLESS noaltcontactsurname %] > <li> > [% IF ( mandatoryaltcontactsurname ) %] > <label for="altcontactsurname" class="required"> >@@ -651,6 +723,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"> >@@ -661,6 +735,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"> >@@ -671,6 +747,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"> >@@ -681,6 +759,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"> >@@ -691,6 +771,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"> >@@ -701,6 +783,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"> >@@ -711,6 +795,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"> >@@ -721,6 +807,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"> >@@ -731,8 +819,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 ) %] >@@ -759,6 +849,7 @@ > > <fieldset class="rows" id="memberentry_library_management"> > <legend>Library Management</legend><ol> >+ [% UNLESS nocardnumber %] > <li> [% IF ( mandatorycardnumber ) %] > <label for="cardnumber" class="required"> > [% ELSE %] >@@ -767,6 +858,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"> >@@ -777,6 +870,7 @@ > [% CGIbranch %] > [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %] > </li> >+ [% END %] > <li> > <label for="categorycode">Category: </label> > <select id="categorycode" name="categorycode"> >@@ -802,6 +896,7 @@ > [% END %] > </select> > </li> >+ [% UNLESS nosort1 %] > <li> > [% IF ( mandatorysort1 ) %] > <label for="sort1" class="required"> >@@ -816,6 +911,8 @@ > [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %] > [% END %] > </li> >+ [% END %] >+ [% UNLESS nosort2 %] > <li> > [% IF ( mandatorysort2 ) %] > <label for="sort2" class="required"> >@@ -830,10 +927,13 @@ > [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %] > [% END %] > </li> >+ [% END %] > </ol> > </fieldset> >+ [% UNLESS nodateenrolled && nodateexpiry && noopacnote && noborrowernotes %] > <fieldset class="rows" id="memberentry_subscription"> > <legend>Library set-up</legend><ol> >+ [% UNLESS nodateenrolled %] > <li> > [% IF ( mandatorydateenrolled ) %] > <label for="dateenrolled" class="required"> >@@ -856,6 +956,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"> >@@ -878,6 +980,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"> >@@ -889,6 +993,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"> >@@ -900,10 +1006,15 @@ > <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> >+ [% END # hide fieldset %] >+ >+ [% UNLESS nouserid && nopassword %] > <fieldset class="rows" id="memberentry_userid"> > <legend>OPAC/Staff Login</legend><ol> >+ [% UNLESS nouserid %] > <li> > [% IF ( mandatoryuserid ) %] > <label for="userid" class="required"> >@@ -920,6 +1031,8 @@ > > [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %] > </li> >+ [%END %] >+ [% UNLESS nopassword %] > <li> > [% IF ( mandatorypassword ) %] > <label for="password" class="required"> >@@ -950,8 +1063,11 @@ > [% 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> >+ [% END # hide fieldset %] > <!--this zones are not necessary in modif mode --> > [% UNLESS ( opadd ) %] > <fieldset class="rows"> >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 63ee154..0ba8784 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 acadc55..cbff3b8 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 > es-ES/mandatory/sysprefs.sql > ); > >-- >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