Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_9756' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-15 19:11:54 -04:00
commit c7599aa48d
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
installer/data/mysql/sysprefs.sql
View file

@ -418,3 +418,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('Persona',0,'Use Mozilla Persona for login','','YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacItemLocation','callnum','Show the shelving location of items in the opac','callnum|ccode|location','Choice');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('TrackClicks','0','Track links clicked',NULL,'Integer');
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('PatronSelfRegistrationAdditionalInstructions','','A free text field to display additional instructions to newly self registered patrons.','','free');

7
installer/data/mysql/updatedatabase.pl
View file

@ -6505,6 +6505,13 @@ if ( CheckVersion($DBversion) ) {
SetVersion($DBversion);
}
$DBversion = "3.11.00.028";
if ( CheckVersion($DBversion) ) {
$dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('PatronSelfRegistrationAdditionalInstructions', '', NULL , 'A free text field to display additional instructions to newly self registered patrons.', 'free' );");
print "Upgrade to $DBversion done (Bug 9756 - Patron self registration missing the system preference PatronSelfRegistrationAdditionalInstructions)\n";
SetVersion($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
View file

@ -596,3 +596,8 @@ OPAC:
- pref: PatronSelfRegistrationBorrowerUnwantedField
class: multi
- (separate columns with |)
-
- "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
- pref: PatronSelfRegistrationAdditionalInstructions
type: textarea
class: html

2
kohaversion.pl
View file

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.11.00.027';
our $VERSION = '3.11.00.028';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install