[PATCH] Bug 3830: Fix spelling error in patron permissions

[Nicole Engard]

---
 .../data/mysql/en/mandatory/userpermissions.sql    |    2 +-
 installer/data/mysql/updatedatabase.pl             |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql
b/installer/data/mysql/en/mandatory/userpermissions.sql
index a8c37d3..31e90b1 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -1,7 +1,7 @@
 INSERT INTO permissions (module_bit, code, description) VALUES
    ( 1, 'circulate_remaining_permissions', 'Remaining circulation
permissions'),
    ( 1, 'override_renewals', 'Override blocked renewals'),
-   ( 9, 'edit_catalogue', 'Edit catalogue'),
+   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
    ( 9, 'fast_cataloging', 'Fast cataloging'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 4e1d1cf..4c039cc 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3291,6 +3291,20 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }

+$DBversion = "3.01.00.100";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+	$dbh->do("INSERT INTO `systempreferences` (`variable`, `value`,
`options`, `explanation`, `type`) VALUES ('casAuthentication', '1',
'', 'Enable or disable CAS authentication', 'YesNo'), ('casLogout',
'1', '', 'Does a logout from Koha should also log out of CAS ?',
'YesNo'), ('casServerUrl', 'https://localhost:8443/cas', '', 'URL of
the cas server', 'Free')");
+	print "Upgrade done (added CAS authentication system preferences)\n";
+    SetVersion ($DBversion);
+}
+
+$DBversion = "XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+	$dbh->do("INSERT INTO permissions (module_bit, code, description)
VALUES (9, 'edit_catalogue', 'Edit catalog (Modify
bibliographic/holdings data)')");
+	print "Upgrade done (fixed spelling error in edit_catalogue permission)\n";
+    SetVersion ($DBversion);
+}
+
 =item DropAllForeignKeys($table)

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

--0016e68ee45f8d47b40479c85ae8
Content-Type: application/octet-stream; 
	name="0002-Bug-3830-Fix-spelling-error-in-patron-permissions.patch"
Content-Disposition: attachment; 
	filename="0002-Bug-3830-Fix-spelling-error-in-patron-permissions.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g2qt7bw00

RnJvbSAzOGMxYTc0MDUzNmFjMGMwZDc5MDI3NTVmMmZjZWM4OTYxYjYyYTVmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogV2VkLCAyIERlYyAyMDA5IDA4OjI2OjU4IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gQnVnIDM4
MzA6IEZpeCBzcGVsbGluZyBlcnJvciBpbiBwYXRyb24gcGVybWlzc2lvbnMKQ29udGVudC1UeXBl
OiB0ZXh0L3BsYWluOyBjaGFyc2V0PSJ1dGYtOCIKCi0tLQogLi4uL2RhdGEvbXlzcWwvZW4vbWFu
ZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwgICAgfCAgICAyICstCiBpbnN0YWxsZXIvZGF0YS9t
eXNxbC91cGRhdGVkYXRhYmFzZS5wbCAgICAgICAgICAgICB8ICAgMTQgKysrKysrKysrKysrKysK
IDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9tYW5kYXRvcnkvdXNlcnBlcm1pc3Npb25z
LnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL2VuL21hbmRhdG9yeS91c2VycGVybWlzc2lvbnMu
c3FsCmluZGV4IGE4YzM3ZDMuLjMxZTkwYjEgMTAwNjQ0Ci0tLSBhL2luc3RhbGxlci9kYXRhL215
c3FsL2VuL21hbmRhdG9yeS91c2VycGVybWlzc2lvbnMuc3FsCisrKyBiL2luc3RhbGxlci9kYXRh
L215c3FsL2VuL21hbmRhdG9yeS91c2VycGVybWlzc2lvbnMuc3FsCkBAIC0xLDcgKzEsNyBAQAog
SU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1vZHVsZV9iaXQsIGNvZGUsIGRlc2NyaXB0aW9uKSBW
QUxVRVMKICAgICggMSwgJ2NpcmN1bGF0ZV9yZW1haW5pbmdfcGVybWlzc2lvbnMnLCAnUmVtYWlu
aW5nIGNpcmN1bGF0aW9uIHBlcm1pc3Npb25zJyksCiAgICAoIDEsICdvdmVycmlkZV9yZW5ld2Fs
cycsICdPdmVycmlkZSBibG9ja2VkIHJlbmV3YWxzJyksCi0gICAoIDksICdlZGl0X2NhdGFsb2d1
ZScsICdFZGl0IGNhdGFsb2d1ZScpLAorICAgKCA5LCAnZWRpdF9jYXRhbG9ndWUnLCAnRWRpdCBj
YXRhbG9nIChNb2RpZnkgYmlibGlvZ3JhcGhpYy9ob2xkaW5ncyBkYXRhKScpLAogICAgKCA5LCAn
ZmFzdF9jYXRhbG9naW5nJywgJ0Zhc3QgY2F0YWxvZ2luZycpLAogICAgKDExLCAndmVuZG9yc19t
YW5hZ2UnLCAnTWFuYWdlIHZlbmRvcnMnKSwKICAgICgxMSwgJ2NvbnRyYWN0c19tYW5hZ2UnLCAn
TWFuYWdlIGNvbnRyYWN0cycpLApkaWZmIC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBk
YXRlZGF0YWJhc2UucGwgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbApp
bmRleCA0ZTFkMWNmLi40YzAzOWNjIDEwMDc1NQotLS0gYS9pbnN0YWxsZXIvZGF0YS9teXNxbC91
cGRhdGVkYXRhYmFzZS5wbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFz
ZS5wbApAQCAtMzI5MSw2ICszMjkxLDIwIEBAIGlmIChDNDo6Q29udGV4dC0+cHJlZmVyZW5jZSgi
VmVyc2lvbiIpIDwgVHJhbnNmb3JtVG9OdW0oJERCdmVyc2lvbikpIHsKICAgICBTZXRWZXJzaW9u
ICgkREJ2ZXJzaW9uKTsKIH0KIAorJERCdmVyc2lvbiA9ICIzLjAxLjAwLjEwMCI7CitpZiAoQzQ6
OkNvbnRleHQtPnByZWZlcmVuY2UoIlZlcnNpb24iKSA8IFRyYW5zZm9ybVRvTnVtKCREQnZlcnNp
b24pKSB7CisJJGRiaC0+ZG8oIklOU0VSVCBJTlRPIGBzeXN0ZW1wcmVmZXJlbmNlc2AgKGB2YXJp
YWJsZWAsIGB2YWx1ZWAsIGBvcHRpb25zYCwgYGV4cGxhbmF0aW9uYCwgYHR5cGVgKSBWQUxVRVMg
KCdjYXNBdXRoZW50aWNhdGlvbicsICcxJywgJycsICdFbmFibGUgb3IgZGlzYWJsZSBDQVMgYXV0
aGVudGljYXRpb24nLCAnWWVzTm8nKSwgKCdjYXNMb2dvdXQnLCAnMScsICcnLCAnRG9lcyBhIGxv
Z291dCBmcm9tIEtvaGEgc2hvdWxkIGFsc28gbG9nIG91dCBvZiBDQVMgPycsICdZZXNObycpLCAo
J2Nhc1NlcnZlclVybCcsICdodHRwczovL2xvY2FsaG9zdDo4NDQzL2NhcycsICcnLCAnVVJMIG9m
IHRoZSBjYXMgc2VydmVyJywgJ0ZyZWUnKSIpOworCXByaW50ICJVcGdyYWRlIGRvbmUgKGFkZGVk
IENBUyBhdXRoZW50aWNhdGlvbiBzeXN0ZW0gcHJlZmVyZW5jZXMpXG4iOworICAgIFNldFZlcnNp
b24gKCREQnZlcnNpb24pOworfQorCiskREJ2ZXJzaW9uID0gIlhYWCI7CitpZiAoQzQ6OkNvbnRl
eHQtPnByZWZlcmVuY2UoIlZlcnNpb24iKSA8IFRyYW5zZm9ybVRvTnVtKCREQnZlcnNpb24pKSB7
CisJJGRiaC0+ZG8oIklOU0VSVCBJTlRPIHBlcm1pc3Npb25zIChtb2R1bGVfYml0LCBjb2RlLCBk
ZXNjcmlwdGlvbikgVkFMVUVTICg5LCAnZWRpdF9jYXRhbG9ndWUnLCAnRWRpdCBjYXRhbG9nIChN
b2RpZnkgYmlibGlvZ3JhcGhpYy9ob2xkaW5ncyBkYXRhKScpIik7CisJcHJpbnQgIlVwZ3JhZGUg
ZG9uZSAoZml4ZWQgc3BlbGxpbmcgZXJyb3IgaW4gZWRpdF9jYXRhbG9ndWUgcGVybWlzc2lvbilc
biI7CisgICAgU2V0VmVyc2lvbiAoJERCdmVyc2lvbik7Cit9CisKID1pdGVtIERyb3BBbGxGb3Jl
aWduS2V5cygkdGFibGUpCiAKICAgRHJvcCBhbGwgZm9yZWlnbiBrZXlzIG9mIHRoZSB0YWJsZSAk
dGFibGUKLS0gCjEuNS42LjUKCg==
--0016e68ee45f8d47b40479c85ae8--