[PATCH] Fixed minor typos in new system preferences.

• Previous message: [Koha-patches] [PATCH 2/2] fix how patron_flagged gets set for opac-user.tmpl
• Next message: [Koha-patches] [PATCH 1/7] bug 3481 followup - fix database update
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---
 installer/data/mysql/en/mandatory/sysprefs.sql |    4 ++--
 installer/data/mysql/updatedatabase.pl         |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index ec042d4..0adefbc 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -250,10 +250,10 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('F
 INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelFormat',
'<itemcallnumber><copynumber>', '30|10', 'This preference defines the
format for the quick spine label printer. Just list the fields you
would like to see in the order you would like to see them, surrounded
by <>, for example <itemcallnumber>.', 'Textarea');
 INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint',
'0', '', 'If this setting is turned on, a print dialog will
automatically pop up for the quick spine label printer.', 'YesNo');
 INSERT INTO `systempreferences`
(variable,value,explanation,options,type)
VALUES('AWSPrivateKey','','See:  http://aws.amazon.com.  Note that
this is required after 2009/08/15 in order to retrieve any enhanced
content other than book covers from Amazon.','','free');
-INSERT INTO `systempreferences`
(variable,value,explanation,options,type)
VALUES('OPACFineNoRenewals','100','Fine Limit above which user canmot
renew books via OPAC','','Integer');
+INSERT INTO `systempreferences`
(variable,value,explanation,options,type)
VALUES('OPACFineNoRenewals','100','Fine limit above which user cannot
renew books via OPAC','','Integer');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'NewItemsDefaultLocation', '', '',
'If set, all new items will have a location of the given Location Code
( Authorized Value type LOC )', '');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'InProcessingToShelvingCart', '0',
'', 'If set, when any item with a location code of PROC is ''checked
in'', it''s location code will be changed to CART.', 'YesNo');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'ReturnToShelvingCart', '0', '', 'If
set, when any item is ''checked in'', it''s location code will be
changed to CART.', 'YesNo');
-INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '',
'If set to yes, a clear screen button will appear on the circulation
page.', 'YesNo');
+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 class="yuimenuitem"><a target="_blank"
class="yuimenuitemlabel"
href="http://worldcat.org/search?q=TITLE"">Other Libraries
(WorldCat)</a></li>\n<li class="yuimenuitem"><a
class="yuimenuitemlabel"
href="http://www.scholar.google.com/scholar?q=TITLE"
target="_blank">Other Databases (Google Scholar)</a></li>\n<li
class="yuimenuitem"><a class="yuimenuitemlabel"
href="http://www.bookfinder.com/search/?author=AUTHOR&amp;title=TITLE&amp;st=xl&amp;ac=qr"
target="_blank">Online Stores (Bookfinder.com)</a></li>','Enter the
HTML that will appear in the \'Search for this title in\' box on the
detail page in the OPAC.  Enter TITLE, AUTHOR, or ISBN in place of
their respective variables in the URL. Leave blank to disable \'More
Searches\' menu.','70|10','Textarea')
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 3323e3c..62952a1 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2592,6 +2592,14 @@ $DBversion = '3.01.00.XXX';
      print "Upgrade to $DBversion done (Add OPACSearchForTitleIn syspref)\n";
      }

+$DBversion = '3.01.00.XXX';
+     if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("UPDATE systempreferences SET explanation='Fine limit
above which user cannot renew books via OPAC' WHERE
variable='OPACFineNoRenewals';");
+     $dbh->do("UPDATE systempreferences SET explanation='If set to
ON, a clear screen button will appear on the circulation page.' WHERE
variable='DisplayClearScreenButton';");
+     SetVersion ($DBversion);
+     print "Upgrade to $DBversion done (fixed typos in new sysprefs)\n";
+     }
+
 =item DropAllForeignKeys($table)

   Drop all foreign keys of the table $table
-- 
1.5.6.5

--001636eee4ea4ce3420471d7f52c
Content-Type: application/octet-stream; 
	name="0006-Fixed-minor-typos-in-new-system-preferences.patch"
Content-Disposition: attachment; 
	filename="0006-Fixed-minor-typos-in-new-system-preferences.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fyqg43a00

RnJvbSA4NGVkYzAyY2RjNTU5ZmU3NjZhMDkzZmMwOGJmMzI4ODcwZDA0YWY1IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogU3VuLCAyMyBBdWcgMjAwOSAxMjoxODozNCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeGVk
IG1pbm9yIHR5cG9zIGluIG5ldyBzeXN0ZW0gcHJlZmVyZW5jZXMuCkNvbnRlbnQtVHlwZTogdGV4
dC9wbGFpbjsgY2hhcnNldD0idXRmLTgiCgotLS0KIGluc3RhbGxlci9kYXRhL215c3FsL2VuL21h
bmRhdG9yeS9zeXNwcmVmcy5zcWwgfCAgICA0ICsrLS0KIGluc3RhbGxlci9kYXRhL215c3FsL3Vw
ZGF0ZWRhdGFiYXNlLnBsICAgICAgICAgfCAgICA4ICsrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs
IDEwIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5zdGFsbGVy
L2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3N5c3ByZWZzLnNxbCBiL2luc3RhbGxlci9kYXRhL215
c3FsL2VuL21hbmRhdG9yeS9zeXNwcmVmcy5zcWwKaW5kZXggZWMwNDJkNC4uMGFkZWZiYyAxMDA2
NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3N5c3ByZWZzLnNxbAor
KysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9tYW5kYXRvcnkvc3lzcHJlZnMuc3FsCkBAIC0y
NTAsMTAgKzI1MCwxMCBAQCBJTlNFUlQgSU5UTyBzeXN0ZW1wcmVmZXJlbmNlcyAodmFyaWFibGUs
dmFsdWUsZXhwbGFuYXRpb24sb3B0aW9ucyx0eXBlKVZBTFVFUygnRgogSU5TRVJUIElOVE8gc3lz
dGVtcHJlZmVyZW5jZXMgKHZhcmlhYmxlLHZhbHVlLG9wdGlvbnMsZXhwbGFuYXRpb24sdHlwZSlW
QUxVRVMoJ1NwaW5lTGFiZWxGb3JtYXQnLCAnPGl0ZW1jYWxsbnVtYmVyPjxjb3B5bnVtYmVyPics
ICczMHwxMCcsICdUaGlzIHByZWZlcmVuY2UgZGVmaW5lcyB0aGUgZm9ybWF0IGZvciB0aGUgcXVp
Y2sgc3BpbmUgbGFiZWwgcHJpbnRlci4gSnVzdCBsaXN0IHRoZSBmaWVsZHMgeW91IHdvdWxkIGxp
a2UgdG8gc2VlIGluIHRoZSBvcmRlciB5b3Ugd291bGQgbGlrZSB0byBzZWUgdGhlbSwgc3Vycm91
bmRlZCBieSA8PiwgZm9yIGV4YW1wbGUgPGl0ZW1jYWxsbnVtYmVyPi4nLCAnVGV4dGFyZWEnKTsK
IElOU0VSVCBJTlRPIHN5c3RlbXByZWZlcmVuY2VzICh2YXJpYWJsZSx2YWx1ZSxvcHRpb25zLGV4
cGxhbmF0aW9uLHR5cGUpVkFMVUVTKCdTcGluZUxhYmVsQXV0b1ByaW50JywgJzAnLCAnJywgJ0lm
IHRoaXMgc2V0dGluZyBpcyB0dXJuZWQgb24sIGEgcHJpbnQgZGlhbG9nIHdpbGwgYXV0b21hdGlj
YWxseSBwb3AgdXAgZm9yIHRoZSBxdWljayBzcGluZSBsYWJlbCBwcmludGVyLicsICdZZXNObycp
OwogSU5TRVJUIElOVE8gYHN5c3RlbXByZWZlcmVuY2VzYCAodmFyaWFibGUsdmFsdWUsZXhwbGFu
YXRpb24sb3B0aW9ucyx0eXBlKSBWQUxVRVMoJ0FXU1ByaXZhdGVLZXknLCcnLCdTZWU6ICBodHRw
Oi8vYXdzLmFtYXpvbi5jb20uICBOb3RlIHRoYXQgdGhpcyBpcyByZXF1aXJlZCBhZnRlciAyMDA5
LzA4LzE1IGluIG9yZGVyIHRvIHJldHJpZXZlIGFueSBlbmhhbmNlZCBjb250ZW50IG90aGVyIHRo
YW4gYm9vayBjb3ZlcnMgZnJvbSBBbWF6b24uJywnJywnZnJlZScpOwotSU5TRVJUIElOVE8gYHN5
c3RlbXByZWZlcmVuY2VzYCAodmFyaWFibGUsdmFsdWUsZXhwbGFuYXRpb24sb3B0aW9ucyx0eXBl
KSBWQUxVRVMoJ09QQUNGaW5lTm9SZW5ld2FscycsJzEwMCcsJ0ZpbmUgTGltaXQgYWJvdmUgd2hp
Y2ggdXNlciBjYW5tb3QgcmVuZXcgYm9va3MgdmlhIE9QQUMnLCcnLCdJbnRlZ2VyJyk7CitJTlNF
UlQgSU5UTyBgc3lzdGVtcHJlZmVyZW5jZXNgICh2YXJpYWJsZSx2YWx1ZSxleHBsYW5hdGlvbixv
cHRpb25zLHR5cGUpIFZBTFVFUygnT1BBQ0ZpbmVOb1JlbmV3YWxzJywnMTAwJywnRmluZSBsaW1p
dCBhYm92ZSB3aGljaCB1c2VyIGNhbm5vdCByZW5ldyBib29rcyB2aWEgT1BBQycsJycsJ0ludGVn
ZXInKTsKIElOU0VSVCBJTlRPIGBzeXN0ZW1wcmVmZXJlbmNlc2AgKCBgdmFyaWFibGVgICwgYHZh
bHVlYCAsIGBvcHRpb25zYCAsIGBleHBsYW5hdGlvbmAgLCBgdHlwZWAgKSBWQUxVRVMgKCAnTmV3
SXRlbXNEZWZhdWx0TG9jYXRpb24nLCAnJywgJycsICdJZiBzZXQsIGFsbCBuZXcgaXRlbXMgd2ls
bCBoYXZlIGEgbG9jYXRpb24gb2YgdGhlIGdpdmVuIExvY2F0aW9uIENvZGUgKCBBdXRob3JpemVk
IFZhbHVlIHR5cGUgTE9DICknLCAnJyk7CiBJTlNFUlQgSU5UTyBgc3lzdGVtcHJlZmVyZW5jZXNg
ICggYHZhcmlhYmxlYCAsIGB2YWx1ZWAgLCBgb3B0aW9uc2AgLCBgZXhwbGFuYXRpb25gICwgYHR5
cGVgICkgVkFMVUVTICggJ0luUHJvY2Vzc2luZ1RvU2hlbHZpbmdDYXJ0JywgJzAnLCAnJywgJ0lm
IHNldCwgd2hlbiBhbnkgaXRlbSB3aXRoIGEgbG9jYXRpb24gY29kZSBvZiBQUk9DIGlzICcnY2hl
Y2tlZCBpbicnLCBpdCcncyBsb2NhdGlvbiBjb2RlIHdpbGwgYmUgY2hhbmdlZCB0byBDQVJULics
ICdZZXNObycpOwogSU5TRVJUIElOVE8gYHN5c3RlbXByZWZlcmVuY2VzYCAoIGB2YXJpYWJsZWAg
LCBgdmFsdWVgICwgYG9wdGlvbnNgICwgYGV4cGxhbmF0aW9uYCAsIGB0eXBlYCApIFZBTFVFUyAo
ICdSZXR1cm5Ub1NoZWx2aW5nQ2FydCcsICcwJywgJycsICdJZiBzZXQsIHdoZW4gYW55IGl0ZW0g
aXMgJydjaGVja2VkIGluJycsIGl0JydzIGxvY2F0aW9uIGNvZGUgd2lsbCBiZSBjaGFuZ2VkIHRv
IENBUlQuJywgJ1llc05vJyk7Ci1JTlNFUlQgSU5UTyBgc3lzdGVtcHJlZmVyZW5jZXNgICggYHZh
cmlhYmxlYCAsIGB2YWx1ZWAgLCBgb3B0aW9uc2AgLCBgZXhwbGFuYXRpb25gICwgYHR5cGVgICkg
VkFMVUVTICggJ0Rpc3BsYXlDbGVhclNjcmVlbkJ1dHRvbicsICcwJywgJycsICdJZiBzZXQgdG8g
eWVzLCBhIGNsZWFyIHNjcmVlbiBidXR0b24gd2lsbCBhcHBlYXIgb24gdGhlIGNpcmN1bGF0aW9u
IHBhZ2UuJywgJ1llc05vJyk7CitJTlNFUlQgSU5UTyBgc3lzdGVtcHJlZmVyZW5jZXNgICggYHZh
cmlhYmxlYCAsIGB2YWx1ZWAgLCBgb3B0aW9uc2AgLCBgZXhwbGFuYXRpb25gICwgYHR5cGVgICkg
VkFMVUVTICggJ0Rpc3BsYXlDbGVhclNjcmVlbkJ1dHRvbicsICcwJywgJycsICdJZiBzZXQgdG8g
T04sIGEgY2xlYXIgc2NyZWVuIGJ1dHRvbiB3aWxsIGFwcGVhciBvbiB0aGUgY2lyY3VsYXRpb24g
cGFnZS4nLCAnWWVzTm8nKTsKIElOU0VSVCBJTlRPIHN5c3RlbXByZWZlcmVuY2VzICh2YXJpYWJs
ZSx2YWx1ZSxvcHRpb25zLGV4cGxhbmF0aW9uLHR5cGUpVkFMVUVTKCdIaWRlUGF0cm9uTmFtZScs
ICcwJywgJycsICdJZiB0aGlzIGlzIHN3aXRjaGVkIG9uLCBwYXRyb24nJ3MgY2FyZG51bWJlciB3
aWxsIGJlIHNob3duIGluc3RlYWQgb2YgdGhlaXIgbmFtZSBvbiB0aGUgaG9sZHMgYW5kIGNhdGFs
b2cgc2NyZWVucycsICdZZXNObycpOwogSU5TRVJUIElOVE8gYHN5c3RlbXByZWZlcmVuY2VzYCAo
dmFyaWFibGUsdmFsdWUsZXhwbGFuYXRpb24sb3B0aW9ucyx0eXBlKSBWQUxVRVMgKCdPUEFDU2Vh
cmNoRm9yVGl0bGVJbicsJzxsaSBjbGFzcz0ieXVpbWVudWl0ZW0iPjxhIHRhcmdldD0iX2JsYW5r
IiBjbGFzcz0ieXVpbWVudWl0ZW1sYWJlbCIgaHJlZj0iaHR0cDovL3dvcmxkY2F0Lm9yZy9zZWFy
Y2g/cT1USVRMRSIiPk90aGVyIExpYnJhcmllcyAoV29ybGRDYXQpPC9hPjwvbGk+XG48bGkgY2xh
c3M9Inl1aW1lbnVpdGVtIj48YSBjbGFzcz0ieXVpbWVudWl0ZW1sYWJlbCIgaHJlZj0iaHR0cDov
L3d3dy5zY2hvbGFyLmdvb2dsZS5jb20vc2Nob2xhcj9xPVRJVExFIiB0YXJnZXQ9Il9ibGFuayI+
T3RoZXIgRGF0YWJhc2VzIChHb29nbGUgU2Nob2xhcik8L2E+PC9saT5cbjxsaSBjbGFzcz0ieXVp
bWVudWl0ZW0iPjxhIGNsYXNzPSJ5dWltZW51aXRlbWxhYmVsIiBocmVmPSJodHRwOi8vd3d3LmJv
b2tmaW5kZXIuY29tL3NlYXJjaC8/YXV0aG9yPUFVVEhPUiZhbXA7dGl0bGU9VElUTEUmYW1wO3N0
PXhsJmFtcDthYz1xciIgdGFyZ2V0PSJfYmxhbmsiPk9ubGluZSBTdG9yZXMgKEJvb2tmaW5kZXIu
Y29tKTwvYT48L2xpPicsJ0VudGVyIHRoZSBIVE1MIHRoYXQgd2lsbCBhcHBlYXIgaW4gdGhlIFwn
U2VhcmNoIGZvciB0aGlzIHRpdGxlIGluXCcgYm94IG9uIHRoZSBkZXRhaWwgcGFnZSBpbiB0aGUg
T1BBQy4gIEVudGVyIFRJVExFLCBBVVRIT1IsIG9yIElTQk4gaW4gcGxhY2Ugb2YgdGhlaXIgcmVz
cGVjdGl2ZSB2YXJpYWJsZXMgaW4gdGhlIFVSTC4gTGVhdmUgYmxhbmsgdG8gZGlzYWJsZSBcJ01v
cmUgU2VhcmNoZXNcJyBtZW51LicsJzcwfDEwJywnVGV4dGFyZWEnKQpkaWZmIC0tZ2l0IGEvaW5z
dGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJhc2UucGwgYi9pbnN0YWxsZXIvZGF0YS9teXNx
bC91cGRhdGVkYXRhYmFzZS5wbAppbmRleCAzMzIzZTNjLi42Mjk1MmExIDEwMDc1NQotLS0gYS9p
bnN0YWxsZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbAorKysgYi9pbnN0YWxsZXIvZGF0
YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbApAQCAtMjU5Miw2ICsyNTkyLDE0IEBAICREQnZlcnNp
b24gPSAnMy4wMS4wMC5YWFgnOwogICAgICBwcmludCAiVXBncmFkZSB0byAkREJ2ZXJzaW9uIGRv
bmUgKEFkZCBPUEFDU2VhcmNoRm9yVGl0bGVJbiBzeXNwcmVmKVxuIjsKICAgICAgfQogCiskREJ2
ZXJzaW9uID0gJzMuMDEuMDAuWFhYJzsKKyAgICAgaWYgKEM0OjpDb250ZXh0LT5wcmVmZXJlbmNl
KCJWZXJzaW9uIikgPCBUcmFuc2Zvcm1Ub051bSgkREJ2ZXJzaW9uKSkgeworICAgICAkZGJoLT5k
bygiVVBEQVRFIHN5c3RlbXByZWZlcmVuY2VzIFNFVCBleHBsYW5hdGlvbj0nRmluZSBsaW1pdCBh
Ym92ZSB3aGljaCB1c2VyIGNhbm5vdCByZW5ldyBib29rcyB2aWEgT1BBQycgV0hFUkUgdmFyaWFi
bGU9J09QQUNGaW5lTm9SZW5ld2Fscyc7Iik7CisgICAgICRkYmgtPmRvKCJVUERBVEUgc3lzdGVt
cHJlZmVyZW5jZXMgU0VUIGV4cGxhbmF0aW9uPSdJZiBzZXQgdG8gT04sIGEgY2xlYXIgc2NyZWVu
IGJ1dHRvbiB3aWxsIGFwcGVhciBvbiB0aGUgY2lyY3VsYXRpb24gcGFnZS4nIFdIRVJFIHZhcmlh
YmxlPSdEaXNwbGF5Q2xlYXJTY3JlZW5CdXR0b24nOyIpOworICAgICBTZXRWZXJzaW9uICgkREJ2
ZXJzaW9uKTsKKyAgICAgcHJpbnQgIlVwZ3JhZGUgdG8gJERCdmVyc2lvbiBkb25lIChmaXhlZCB0
eXBvcyBpbiBuZXcgc3lzcHJlZnMpXG4iOworICAgICB9CisKID1pdGVtIERyb3BBbGxGb3JlaWdu
S2V5cygkdGFibGUpCiAKICAgRHJvcCBhbGwgZm9yZWlnbiBrZXlzIG9mIHRoZSB0YWJsZSAkdGFi
bGUKLS0gCjEuNS42LjUKCg==
--001636eee4ea4ce3420471d7f52c--

• Previous message: [Koha-patches] [PATCH 2/2] fix how patron_flagged gets set for opac-user.tmpl
• Next message: [Koha-patches] [PATCH 1/7] bug 3481 followup - fix database update
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]