[PATCH] bug 3817 added patron permissions for tag tool

[Nicole Engard]

---
 .../data/mysql/en/mandatory/userpermissions.sql    |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../prog/en/modules/tools/tools-home.tmpl          |    2 +-
 tags/review.pl                                     |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql
b/installer/data/mysql/en/mandatory/userpermissions.sql
index 29b3b05..ddaec21 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -16,4 +16,5 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'delete_anonymize_patrons', 'Delete old borrowers and
anonymize circulation history (deletes borrower reading history)'),
    (13, 'batch_upload_patron_images', 'Upload patron images in batch
or one at a time'),
    (13, 'schedule_tasks', 'Schedule tasks to run')
+   (13, 'moderate_tags', 'Moderate patron tags')
 ;
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 7dd236c..513414c 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2496,6 +2496,13 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (AllowHoldDateInFuture and
OPACAllowHoldDateInFuture sysprefs)\n";
 }

+$DBversion = 'XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO permissions (module_bit, code, description)
VALUES ( 13, 'moderate_tags', 'Moderate patron tags')");
+    SetVersion ($DBversion);
+    print "Upgrade to $DBversion done (added patron permission for
accessing the tags tool)\n";
+}
+
 =item DropAllForeignKeys($table)

   Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index be817d9..a5d1f80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -39,7 +39,7 @@
 	<dd>Moderate patron comments</dd>
     <!-- /TMPL_IF -->

-    <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" --><!--
FIXME: Update here when Tag specific permission is created. -->
+    <!-- TMPL_IF NAME="CAN_user_tools_moderate_tags" -->
     <dt><a href="/cgi-bin/koha/tags/review.pl">Tags</a></dt>
 	<dd>Moderate patron tags</dd>
     <!-- /TMPL_IF -->
diff --git a/tags/review.pl b/tags/review.pl
index 421da4e..1dea768 100755
--- a/tags/review.pl
+++ b/tags/review.pl
@@ -35,7 +35,7 @@ use C4::Debug;
 use C4::Tags 0.03 qw(get_tags get_approval_rows approval_counts
whitelist blacklist is_approved);

 my $script_name = "/cgi-bin/koha/tags/review.pl";
-my $needed_flags = { tools => 'moderate_comments' };	# FIXME: replace
when more specific permission is created.
+my $needed_flags = { tools => 'moderate_tags' };

 sub ajax_auth_cgi ($) {		# returns CGI object
 	my $needed_flags = shift;
-- 
1.5.6.5

--001636c928dfe75a1d0479980efb
Content-Type: application/octet-stream; 
	name="0002-bug-3817-added-patron-permissions-for-tag-tool.patch"
Content-Disposition: attachment; 
	filename="0002-bug-3817-added-patron-permissions-for-tag-tool.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g2ndoyrp0

RnJvbSAyNmU5Mzg4YjY1MmU3YjdkMzg4NDQwOGRkZDEyN2E3ODllOGI1MzZjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogVGh1LCAyNiBOb3YgMjAwOSAwODozNzowMyAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIGJ1ZyAz
ODE3IGFkZGVkIHBhdHJvbiBwZXJtaXNzaW9ucyBmb3IgdGFnIHRvb2wKQ29udGVudC1UeXBlOiB0
ZXh0L3BsYWluOyBjaGFyc2V0PSJ1dGYtOCIKCi0tLQogLi4uL2RhdGEvbXlzcWwvZW4vbWFuZGF0
b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwgICAgfCAgICAxICsKIGluc3RhbGxlci9kYXRhL215c3Fs
L3VwZGF0ZWRhdGFiYXNlLnBsICAgICAgICAgICAgIHwgICAgNyArKysrKysrCiAuLi4vcHJvZy9l
bi9tb2R1bGVzL3Rvb2xzL3Rvb2xzLWhvbWUudG1wbCAgICAgICAgICB8ICAgIDIgKy0KIHRhZ3Mv
cmV2aWV3LnBsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMiArLQog
NCBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAt
LWdpdCBhL2luc3RhbGxlci9kYXRhL215c3FsL2VuL21hbmRhdG9yeS91c2VycGVybWlzc2lvbnMu
c3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5z
cWwKaW5kZXggMjliM2IwNS4uZGRhZWMyMSAxMDA2NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlz
cWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwKKysrIGIvaW5zdGFsbGVyL2RhdGEv
bXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwKQEAgLTE2LDQgKzE2LDUgQEAg
SU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1vZHVsZV9iaXQsIGNvZGUsIGRlc2NyaXB0aW9uKSBW
QUxVRVMKICAgICgxMywgJ2RlbGV0ZV9hbm9ueW1pemVfcGF0cm9ucycsICdEZWxldGUgb2xkIGJv
cnJvd2VycyBhbmQgYW5vbnltaXplIGNpcmN1bGF0aW9uIGhpc3RvcnkgKGRlbGV0ZXMgYm9ycm93
ZXIgcmVhZGluZyBoaXN0b3J5KScpLAogICAgKDEzLCAnYmF0Y2hfdXBsb2FkX3BhdHJvbl9pbWFn
ZXMnLCAnVXBsb2FkIHBhdHJvbiBpbWFnZXMgaW4gYmF0Y2ggb3Igb25lIGF0IGEgdGltZScpLAog
ICAgKDEzLCAnc2NoZWR1bGVfdGFza3MnLCAnU2NoZWR1bGUgdGFza3MgdG8gcnVuJykKKyAgICgx
MywgJ21vZGVyYXRlX3RhZ3MnLCAnTW9kZXJhdGUgcGF0cm9uIHRhZ3MnKQogOwpkaWZmIC0tZ2l0
IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJhc2UucGwgYi9pbnN0YWxsZXIvZGF0
YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbAppbmRleCA3ZGQyMzZjLi41MTM0MTRjIDEwMDc1NQot
LS0gYS9pbnN0YWxsZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbAorKysgYi9pbnN0YWxs
ZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbApAQCAtMjQ5Niw2ICsyNDk2LDEzIEBAIGlm
IChDNDo6Q29udGV4dC0+cHJlZmVyZW5jZSgiVmVyc2lvbiIpIDwgVHJhbnNmb3JtVG9OdW0oJERC
dmVyc2lvbikpIHsKICAgICBwcmludCAiVXBncmFkZSB0byAkREJ2ZXJzaW9uIGRvbmUgKEFsbG93
SG9sZERhdGVJbkZ1dHVyZSBhbmQgT1BBQ0FsbG93SG9sZERhdGVJbkZ1dHVyZSBzeXNwcmVmcylc
biI7CiB9CiAKKyREQnZlcnNpb24gPSAnWFhYJzsKK2lmIChDNDo6Q29udGV4dC0+cHJlZmVyZW5j
ZSgiVmVyc2lvbiIpIDwgVHJhbnNmb3JtVG9OdW0oJERCdmVyc2lvbikpIHsKKyAgICAkZGJoLT5k
bygiSU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1vZHVsZV9iaXQsIGNvZGUsIGRlc2NyaXB0aW9u
KSBWQUxVRVMgKCAxMywgJ21vZGVyYXRlX3RhZ3MnLCAnTW9kZXJhdGUgcGF0cm9uIHRhZ3MnKSIp
OworICAgIFNldFZlcnNpb24gKCREQnZlcnNpb24pOworICAgIHByaW50ICJVcGdyYWRlIHRvICRE
QnZlcnNpb24gZG9uZSAoYWRkZWQgcGF0cm9uIHBlcm1pc3Npb24gZm9yIGFjY2Vzc2luZyB0aGUg
dGFncyB0b29sKVxuIjsKK30KKwogPWl0ZW0gRHJvcEFsbEZvcmVpZ25LZXlzKCR0YWJsZSkKIAog
ICBEcm9wIGFsbCBmb3JlaWduIGtleXMgb2YgdGhlIHRhYmxlICR0YWJsZQpkaWZmIC0tZ2l0IGEv
a29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL3Rvb2xzLWhvbWUu
dG1wbCBiL2tvaGEtdG1wbC9pbnRyYW5ldC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy90b29s
cy1ob21lLnRtcGwKaW5kZXggYmU4MTdkOS4uYTVkMWY4MCAxMDA2NDQKLS0tIGEva29oYS10bXBs
L2ludHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL3Rvb2xzLWhvbWUudG1wbAorKysg
Yi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvdG9vbHMtaG9t
ZS50bXBsCkBAIC0zOSw3ICszOSw3IEBACiAJPGRkPk1vZGVyYXRlIHBhdHJvbiBjb21tZW50czwv
ZGQ+CiAgICAgPCEtLSAvVE1QTF9JRiAtLT4KIAotICAgIDwhLS0gVE1QTF9JRiBOQU1FPSJDQU5f
dXNlcl90b29sc19tb2RlcmF0ZV9jb21tZW50cyIgLS0+PCEtLSBGSVhNRTogVXBkYXRlIGhlcmUg
d2hlbiBUYWcgc3BlY2lmaWMgcGVybWlzc2lvbiBpcyBjcmVhdGVkLiAtLT4KKyAgICA8IS0tIFRN
UExfSUYgTkFNRT0iQ0FOX3VzZXJfdG9vbHNfbW9kZXJhdGVfdGFncyIgLS0+CiAgICAgPGR0Pjxh
IGhyZWY9Ii9jZ2ktYmluL2tvaGEvdGFncy9yZXZpZXcucGwiPlRhZ3M8L2E+PC9kdD4KIAk8ZGQ+
TW9kZXJhdGUgcGF0cm9uIHRhZ3M8L2RkPgogICAgIDwhLS0gL1RNUExfSUYgLS0+CmRpZmYgLS1n
aXQgYS90YWdzL3Jldmlldy5wbCBiL3RhZ3MvcmV2aWV3LnBsCmluZGV4IDQyMWRhNGUuLjFkZWE3
NjggMTAwNzU1Ci0tLSBhL3RhZ3MvcmV2aWV3LnBsCisrKyBiL3RhZ3MvcmV2aWV3LnBsCkBAIC0z
NSw3ICszNSw3IEBAIHVzZSBDNDo6RGVidWc7CiB1c2UgQzQ6OlRhZ3MgMC4wMyBxdyhnZXRfdGFn
cyBnZXRfYXBwcm92YWxfcm93cyBhcHByb3ZhbF9jb3VudHMgd2hpdGVsaXN0IGJsYWNrbGlzdCBp
c19hcHByb3ZlZCk7CiAKIG15ICRzY3JpcHRfbmFtZSA9ICIvY2dpLWJpbi9rb2hhL3RhZ3MvcmV2
aWV3LnBsIjsKLW15ICRuZWVkZWRfZmxhZ3MgPSB7IHRvb2xzID0+ICdtb2RlcmF0ZV9jb21tZW50
cycgfTsJIyBGSVhNRTogcmVwbGFjZSB3aGVuIG1vcmUgc3BlY2lmaWMgcGVybWlzc2lvbiBpcyBj
cmVhdGVkLgorbXkgJG5lZWRlZF9mbGFncyA9IHsgdG9vbHMgPT4gJ21vZGVyYXRlX3RhZ3MnIH07
CiAKIHN1YiBhamF4X2F1dGhfY2dpICgkKSB7CQkjIHJldHVybnMgQ0dJIG9iamVjdAogCW15ICRu
ZWVkZWRfZmxhZ3MgPSBzaGlmdDsKLS0gCjEuNS42LjUKCg==
--001636c928dfe75a1d0479980efb--