[PATCH] replacement for bug 3817 added patron permissions for tag tool
Nicole Engard
nengard at gmail.com
Wed Dec 2 16:02:49 CET 2009
---
.../data/mysql/en/mandatory/userpermissions.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 3 ++-
.../prog/en/modules/tools/tools-home.tmpl | 2 +-
tags/review.pl | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql
b/installer/data/mysql/en/mandatory/userpermissions.sql
index 31e90b1..1f61cb8 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -31,6 +31,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(13, 'batchmod', 'Perform batch modification of items'),
(13, 'batchdel', 'Perform batch deletion of items'),
(13, 'manage_csv_profiles', 'Manage CSV export profiles'),
+ (13, 'moderate_tags', 'Moderate patron tags'),
(16, 'execute_reports', 'Execute SQL reports'),
(16, 'create_reports', 'Create SQL Reports')
;
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 4c039cc..a5c5492 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3305,6 +3305,13 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
+$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')");
+ print "Upgrade done (adding patron permissions for tags tool)\n";
+ SetVersion ($DBversion);
+}
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index e9298b6..c2314c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -29,7 +29,8 @@
<!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" -->
<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Moderate OPAC
comments</a></li>
<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" --><!--
FIXME: Update here when Tag specific permission is created. --><li><a
href="/cgi-bin/koha/tags/review.pl">Moderate patron tags</a></li>
+ <!-- TMPL_IF NAME="CAN_user_tools_moderate_tags" -->
+ <li><a href="/cgi-bin/koha/tags/review.pl">Moderate patron tags</a></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_tools_manage_csv_profiles" -->
<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV Profiles</a></li>
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 090e172..c326b92 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
@@ -40,7 +40,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..0667f3d 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' }; # FIXME: replace
when more specific permission is created.
sub ajax_auth_cgi ($) { # returns CGI object
my $needed_flags = shift;
--
1.5.6.5
--001636c5bf50277c790479c9aff3
Content-Type: application/octet-stream;
name="0005-replacement-for-bug-3817-added-patron-permissions-fo.patch"
Content-Disposition: attachment;
filename="0005-replacement-for-bug-3817-added-patron-permissions-fo.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g2qwlt940
RnJvbSBlYmM2NDQ0YjQ2Nzk4YjBkNDZhYzMyMzA0MTFlNzhiMmFjYTI3MmQ0IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogV2VkLCAyIERlYyAyMDA5IDEwOjAyOjQ5IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gcmVwbGFj
ZW1lbnQgZm9yIGJ1ZyAzODE3IGFkZGVkIHBhdHJvbiBwZXJtaXNzaW9ucyBmb3IgdGFnIHRvb2wK
Q29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PSJ1dGYtOCIKCi0tLQogLi4uL2RhdGEv
bXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwgICAgfCAgICAxICsKIGluc3Rh
bGxlci9kYXRhL215c3FsL3VwZGF0ZWRhdGFiYXNlLnBsICAgICAgICAgICAgIHwgICAgNyArKysr
KysrCiAuLi4vaW50cmFuZXQtdG1wbC9wcm9nL2VuL2luY2x1ZGVzL3Rvb2xzLW1lbnUuaW5jICB8
ICAgIDMgKystCiAuLi4vcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL3Rvb2xzLWhvbWUudG1wbCAgICAg
ICAgICB8ICAgIDIgKy0KIHRhZ3MvcmV2aWV3LnBsICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIHwgICAgMiArLQogNSBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAz
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215c3FsL2VuL21hbmRh
dG9yeS91c2VycGVybWlzc2lvbnMuc3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0
b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwKaW5kZXggMzFlOTBiMS4uMWY2MWNiOCAxMDA2NDQKLS0t
IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwK
KysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5z
cWwKQEAgLTMxLDYgKzMxLDcgQEAgSU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1vZHVsZV9iaXQs
IGNvZGUsIGRlc2NyaXB0aW9uKSBWQUxVRVMKICAgICgxMywgJ2JhdGNobW9kJywgJ1BlcmZvcm0g
YmF0Y2ggbW9kaWZpY2F0aW9uIG9mIGl0ZW1zJyksCiAgICAoMTMsICdiYXRjaGRlbCcsICdQZXJm
b3JtIGJhdGNoIGRlbGV0aW9uIG9mIGl0ZW1zJyksCiAgICAoMTMsICdtYW5hZ2VfY3N2X3Byb2Zp
bGVzJywgJ01hbmFnZSBDU1YgZXhwb3J0IHByb2ZpbGVzJyksCisgICAoMTMsICdtb2RlcmF0ZV90
YWdzJywgJ01vZGVyYXRlIHBhdHJvbiB0YWdzJyksCiAgICAoMTYsICdleGVjdXRlX3JlcG9ydHMn
LCAnRXhlY3V0ZSBTUUwgcmVwb3J0cycpLAogICAgKDE2LCAnY3JlYXRlX3JlcG9ydHMnLCAnQ3Jl
YXRlIFNRTCBSZXBvcnRzJykKIDsKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215c3FsL3Vw
ZGF0ZWRhdGFiYXNlLnBsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJhc2UucGwK
aW5kZXggNGMwMzljYy4uYTVjNTQ5MiAxMDA3NTUKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwv
dXBkYXRlZGF0YWJhc2UucGwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJh
c2UucGwKQEAgLTMzMDUsNiArMzMwNSwxMyBAQCBpZiAoQzQ6OkNvbnRleHQtPnByZWZlcmVuY2Uo
IlZlcnNpb24iKSA8IFRyYW5zZm9ybVRvTnVtKCREQnZlcnNpb24pKSB7CiAgICAgU2V0VmVyc2lv
biAoJERCdmVyc2lvbik7CiB9CiAKKyREQnZlcnNpb24gPSAiWFhYIjsKK2lmIChDNDo6Q29udGV4
dC0+cHJlZmVyZW5jZSgiVmVyc2lvbiIpIDwgVHJhbnNmb3JtVG9OdW0oJERCdmVyc2lvbikpIHsK
KwkkZGJoLT5kbygiSU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1vZHVsZV9iaXQsIGNvZGUsIGRl
c2NyaXB0aW9uKSBWQUxVRVMgKDEzLCAnbW9kZXJhdGVfdGFncycsICdNb2RlcmF0ZSBwYXRyb24g
dGFncycpIik7CisJcHJpbnQgIlVwZ3JhZGUgZG9uZSAoYWRkaW5nIHBhdHJvbiBwZXJtaXNzaW9u
cyBmb3IgdGFncyB0b29sKVxuIjsKKyAgICBTZXRWZXJzaW9uICgkREJ2ZXJzaW9uKTsKK30KKwog
PWl0ZW0gRHJvcEFsbEZvcmVpZ25LZXlzKCR0YWJsZSkKIAogICBEcm9wIGFsbCBmb3JlaWduIGtl
eXMgb2YgdGhlIHRhYmxlICR0YWJsZQpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRt
cGwvcHJvZy9lbi9pbmNsdWRlcy90b29scy1tZW51LmluYyBiL2tvaGEtdG1wbC9pbnRyYW5ldC10
bXBsL3Byb2cvZW4vaW5jbHVkZXMvdG9vbHMtbWVudS5pbmMKaW5kZXggZTkyOThiNi4uYzIzMTRj
MSAxMDA2NDQKLS0tIGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9lbi9pbmNsdWRlcy90
b29scy1tZW51LmluYworKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL2luY2x1
ZGVzL3Rvb2xzLW1lbnUuaW5jCkBAIC0yOSw3ICsyOSw4IEBACiAgICAgPCEtLSBUTVBMX0lGIE5B
TUU9IkNBTl91c2VyX3Rvb2xzX21vZGVyYXRlX2NvbW1lbnRzIiAtLT4KIAk8bGk+PGEgaHJlZj0i
L2NnaS1iaW4va29oYS9yZXZpZXdzL3Jldmlld3N3YWl0aW5nLnBsIj5Nb2RlcmF0ZSBPUEFDIGNv
bW1lbnRzPC9hPjwvbGk+CiAgICAgPCEtLSAvVE1QTF9JRiAtLT4KLSAgICA8IS0tIFRNUExfSUYg
TkFNRT0iQ0FOX3VzZXJfdG9vbHNfbW9kZXJhdGVfY29tbWVudHMiIC0tPjwhLS0gRklYTUU6IFVw
ZGF0ZSBoZXJlIHdoZW4gVGFnIHNwZWNpZmljIHBlcm1pc3Npb24gaXMgY3JlYXRlZC4gLS0+PGxp
PjxhIGhyZWY9Ii9jZ2ktYmluL2tvaGEvdGFncy9yZXZpZXcucGwiPk1vZGVyYXRlIHBhdHJvbiB0
YWdzPC9hPjwvbGk+CisgICAgPCEtLSBUTVBMX0lGIE5BTUU9IkNBTl91c2VyX3Rvb2xzX21vZGVy
YXRlX3RhZ3MiIC0tPgorICAgIDxsaT48YSBocmVmPSIvY2dpLWJpbi9rb2hhL3RhZ3MvcmV2aWV3
LnBsIj5Nb2RlcmF0ZSBwYXRyb24gdGFnczwvYT48L2xpPgogICAgIDwhLS0gL1RNUExfSUYgLS0+
CiAgICAgPCEtLSBUTVBMX0lGIE5BTUU9IkNBTl91c2VyX3Rvb2xzX21hbmFnZV9jc3ZfcHJvZmls
ZXMiIC0tPgogCTxsaT48YSBocmVmPSIvY2dpLWJpbi9rb2hhL3Rvb2xzL2Nzdi1wcm9maWxlcy5w
bCI+Q1NWIFByb2ZpbGVzPC9hPjwvbGk+CmRpZmYgLS1naXQgYS9rb2hhLXRtcGwvaW50cmFuZXQt
dG1wbC9wcm9nL2VuL21vZHVsZXMvdG9vbHMvdG9vbHMtaG9tZS50bXBsIGIva29oYS10bXBsL2lu
dHJhbmV0LXRtcGwvcHJvZy9lbi9tb2R1bGVzL3Rvb2xzL3Rvb2xzLWhvbWUudG1wbAppbmRleCAw
OTBlMTcyLi5jMzI2YjkyIDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9n
L2VuL21vZHVsZXMvdG9vbHMvdG9vbHMtaG9tZS50bXBsCisrKyBiL2tvaGEtdG1wbC9pbnRyYW5l
dC10bXBsL3Byb2cvZW4vbW9kdWxlcy90b29scy90b29scy1ob21lLnRtcGwKQEAgLTQwLDcgKzQw
LDcgQEAKIAk8ZGQ+TW9kZXJhdGUgcGF0cm9uIGNvbW1lbnRzPC9kZD4KICAgICA8IS0tIC9UTVBM
X0lGIC0tPgogCi0gICAgPCEtLSBUTVBMX0lGIE5BTUU9IkNBTl91c2VyX3Rvb2xzX21vZGVyYXRl
X2NvbW1lbnRzIiAtLT48IS0tIEZJWE1FOiBVcGRhdGUgaGVyZSB3aGVuIFRhZyBzcGVjaWZpYyBw
ZXJtaXNzaW9uIGlzIGNyZWF0ZWQuIC0tPgorICAgIDwhLS0gVE1QTF9JRiBOQU1FPSJDQU5fdXNl
cl90b29sc19tb2RlcmF0ZV90YWdzIiAtLT4KICAgICA8ZHQ+PGEgaHJlZj0iL2NnaS1iaW4va29o
YS90YWdzL3Jldmlldy5wbCI+VGFnczwvYT48L2R0PgogCTxkZD5Nb2RlcmF0ZSBwYXRyb24gdGFn
czwvZGQ+CiAgICAgPCEtLSAvVE1QTF9JRiAtLT4KZGlmZiAtLWdpdCBhL3RhZ3MvcmV2aWV3LnBs
IGIvdGFncy9yZXZpZXcucGwKaW5kZXggNDIxZGE0ZS4uMDY2N2YzZCAxMDA3NTUKLS0tIGEvdGFn
cy9yZXZpZXcucGwKKysrIGIvdGFncy9yZXZpZXcucGwKQEAgLTM1LDcgKzM1LDcgQEAgdXNlIEM0
OjpEZWJ1ZzsKIHVzZSBDNDo6VGFncyAwLjAzIHF3KGdldF90YWdzIGdldF9hcHByb3ZhbF9yb3dz
IGFwcHJvdmFsX2NvdW50cyB3aGl0ZWxpc3QgYmxhY2tsaXN0IGlzX2FwcHJvdmVkKTsKIAogbXkg
JHNjcmlwdF9uYW1lID0gIi9jZ2ktYmluL2tvaGEvdGFncy9yZXZpZXcucGwiOwotbXkgJG5lZWRl
ZF9mbGFncyA9IHsgdG9vbHMgPT4gJ21vZGVyYXRlX2NvbW1lbnRzJyB9OwkjIEZJWE1FOiByZXBs
YWNlIHdoZW4gbW9yZSBzcGVjaWZpYyBwZXJtaXNzaW9uIGlzIGNyZWF0ZWQuCitteSAkbmVlZGVk
X2ZsYWdzID0geyB0b29scyA9PiAnbW9kZXJhdGVfdGFncycgfTsJIyBGSVhNRTogcmVwbGFjZSB3
aGVuIG1vcmUgc3BlY2lmaWMgcGVybWlzc2lvbiBpcyBjcmVhdGVkLgogCiBzdWIgYWpheF9hdXRo
X2NnaSAoJCkgewkJIyByZXR1cm5zIENHSSBvYmplY3QKIAlteSAkbmVlZGVkX2ZsYWdzID0gc2hp
ZnQ7Ci0tIAoxLjUuNi41Cgo=
--001636c5bf50277c790479c9aff3--
More information about the Koha-patches
mailing list