[Koha-patches] [PATCH] [SIGNED-OFF] Bug 6158: Permissions scoped wrong for T::T
Owen Leonard
oleonard at myacpl.org
Mon Apr 11 18:17:39 CEST 2011
From: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Permission flags should always have absolute scope.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
.../prog/en/includes/budgets-admin-toolbar.inc | 2 +-
.../prog/en/modules/acqui/booksellers.tt | 2 +-
.../prog/en/modules/catalogue/moredetail.tt | 14 +++++++-------
.../prog/en/modules/cataloguing/addbooks.tt | 6 +++---
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 4 ++--
.../prog/en/modules/reserve/request.tt | 10 +++++-----
.../prog/en/modules/serials/serials-home.tt | 2 +-
.../prog/en/modules/tools/batchMod-del.tt | 2 +-
.../prog/en/modules/tools/batchMod-edit.tt | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
index 5c796ee..da64ca4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -60,7 +60,7 @@
[% FOREACH auth_cats_loo IN auth_cats_loop %]
{ text: _("Plan by [% auth_cats_loo.authcat %] "),
url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% auth_cats_loo.budget_period_id %]&authcat=[% auth_cats_loo.authcat %]"
- [% UNLESS ( auth_cats_loo.CAN_user_acquisition_planning_manage ) %], id:'disabled' [% END %]
+ [% UNLESS ( CAN_user_acquisition_planning_manage ) %], id:'disabled' [% END %]
},
[% END %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index a54a99d..842f75d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -58,7 +58,7 @@
[% ELSE %]
<tr>
[% END %]
- <td>[% IF ( loop_supplier.CAN_user_acquisition_order_manage ) %]
+ <td>[% IF ( CAN_user_acquisition_order_manage ) %]
[% IF ( loop_supplier.active ) %]
<a href="basketheader.pl?booksellerid=[% loop_supplier.supplierid %]&op=add_form">New basket</a>
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 2a67599..86c8a3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -43,8 +43,8 @@
[% FOREACH ITEM_DAT IN ITEM_DATA %]
<div class="yui-g">
<h3 id="item[% ITEM_DAT.itemnumber %]">Barcode [% ITEM_DAT.barcode %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext %] [% END %]</h3>
- <div class="listgroup"><h4>Item Information [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
- [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_items ) %]
+ <div class="listgroup"><h4>Item Information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
+ [% IF ( CAN_user_editcatalogue_edit_items ) %]
<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber %]&itemnumber=[% ITEM_DAT.itemnumber %]">[Edit Item]</a>
[% END %]
[% END %][% END %]</h4>
@@ -71,7 +71,7 @@
<li><span class="label">Current Renewals:</span> [% ITEM_DAT.renewals %] </li>
[% IF ( ITEM_DAT.itemlostloop ) %]
<li><span class="label">Lost Status:</span>
- [% IF ( ITEM_DAT.CAN_user_circulate ) %]
+ [% IF ( CAN_user_circulate ) %]
<form action="updateitem.pl" method="post">
<input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber %]" />
@@ -101,7 +101,7 @@
[% END %]
[% IF ( ITEM_DAT.itemdamagedloop ) %]
<li><span class="label">Damaged Status:</span>
- [% IF ( ITEM_DAT.CAN_user_circulate ) %]
+ [% IF ( CAN_user_circulate ) %]
<form action="updateitem.pl" method="post">
<input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber %]" />
@@ -130,7 +130,7 @@
</li>
[% END %]
<li><span class="label">Withdrawn?:</span>[% IF ( ITEM_DAT.wthdrawn ) %]Yes[% ELSE %]No[% END %]
- [% IF ( ITEM_DAT.CAN_user_circulate ) %]
+ [% IF ( CAN_user_circulate ) %]
<form action="updateitem.pl" method="post">
<input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber %]" />
@@ -152,7 +152,7 @@
<ol class="bibliodetails">
<li><span class="label">
- [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_catalogue ) %]
+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
Accession Date:</span>
[% IF ( ITEM_DAT.basketno ) %]
@@ -175,7 +175,7 @@
<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %] </li>
<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %] </li>
<li><span class="label">Public Note:</span>
- [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_items ) %]
+ [% IF ( CAN_user_editcatalogue_edit_items ) %]
<form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
<input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
<textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes %]</textarea><input type="submit" name="submit" class="submit" value="Update" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 8a533ba..f5e3712 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -98,8 +98,8 @@
</td>
<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
</td>
- [% IF ( resultsloo.CAN_user_editcatalogue_edit_catalogue ) %]<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]">Edit biblio</a></td>[% END %]
- [% IF ( resultsloo.CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit Items</a></td>[% END %]
+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]">Edit biblio</a></td>[% END %]
+ [% IF ( CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit Items</a></td>[% END %]
</tr>
[% END %]
</table>
@@ -142,7 +142,7 @@
<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
</td>
<td>
- <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]" [% UNLESS ( breeding_loo.CAN_user_editcatalogue_edit_catalogue ) %] class="disabled" onclick="return false;"[% END %]>Add biblio</a>
+ <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]" [% UNLESS ( CAN_user_editcatalogue_edit_catalogue ) %] class="disabled" onclick="return false;"[% END %]>Add biblio</a>
</td>
</tr>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index e83f20e..e43e164 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -105,7 +105,7 @@
[% FOREACH koha_new IN koha_news %]
<div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
<p>[% koha_new.new %]</p>
- <p class="newsfooter"> Posted on [% koha_new.newdate %] [% IF ( koha_new.CAN_user_tools ) %]
+ <p class="newsfooter"> Posted on [% koha_new.newdate %] [% IF ( CAN_user_tools ) %]
<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew %]">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% koha_new.idnew %]">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>[% END %]</p></div>
[% END %]
</div><!-- /koha-news -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 68e65e9..31fd512 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -171,13 +171,13 @@ canned reports and writing custom SQL reports.</p>
</td>
<td>
<a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Show%20SQL">Show</a>
- [% IF ( savedreport.CAN_user_reports_create_reports ) %]
+ [% IF ( CAN_user_reports_create_reports ) %]
<a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Edit%20SQL">Edit</a>
[% END %]
</td>
<td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Run%20this%20report">Run</a>
<a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]">Schedule</a></td>
- [% IF ( savedreport.CAN_user_reports_create_reports ) %]
+ [% IF ( CAN_user_reports_create_reports ) %]
<td><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved">Delete</a></td>
[% END %]
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 43b6cd1..2c392b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -570,7 +570,7 @@ function checkMultiHold() {
<caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title |html %]</a></caption>
[% END %]
<tr>
- [% IF ( biblioloo.CAN_user_reserveforothers_modify_holds_priority ) %]
+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
<th>Priority</th>
<th> </th>
[% ELSE %]
@@ -582,7 +582,7 @@ function checkMultiHold() {
<th>Expiration</th>
<th>Pick up Library</th>
<th>Details</th>
- [% IF ( biblioloo.CAN_user_reserveforothers_modify_holds_priority ) %]
+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
<th><img src="/intranet-tmpl/[% biblioloo.theme %]/img/go-bottom.png" border="0" alt="Toggle Set to Lowest Priority" /></th>
[% END %]
<th> </th>
@@ -600,14 +600,14 @@ function checkMultiHold() {
<option value="W" selected="selected">Waiting</option>
[% END %]
[% END %]
- [% IF ( reserveloo.CAN_user_reserveforothers_modify_holds_priority ) %][% FOREACH optionloo IN reserveloo.optionloop %]
+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %][% FOREACH optionloo IN reserveloo.optionloop %]
[% IF ( optionloo.selected ) %]<option value="[% optionloo.num %]" selected="selected">[% optionloo.num %]</option>[% ELSE %]<option value="[% optionloo.num %]">[% optionloo.num %]</option>[% END %]
[% END %][% ELSE %]<option value=""></option>[% END %]
<option value="del">del</option>
</select>
</td>
- [% IF ( reserveloo.CAN_user_reserveforothers_modify_holds_priority ) %]
+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
<td style="white-space:nowrap;">
<a title="Move Hold Up" href="request.pl?action=move&where=up&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]">
<img src="/intranet-tmpl/[% reserveloo.theme %]/img/go-up.png" border="0" alt="Go up" />
@@ -699,7 +699,7 @@ function checkMultiHold() {
[% END %]
</td>
- [% IF ( reserveloo.CAN_user_reserveforothers_modify_holds_priority ) %]
+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
<td>
<a title="Toggle Lowest Priority" href="request.pl?action=setLowestPriority&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]">
[% IF ( reserveloo.lowestPriority ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index 207f831..56a8214 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -129,7 +129,7 @@ Serials updated :
[% IF ( subscription.cannotedit ) %]
[% ELSE %]
- [% IF ( subscription.CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a>[% END %]
+ [% IF ( CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7">Serial receive</a>[% END %]
[% END %]
</td>
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 20d04a7..21013f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -162,7 +162,7 @@ for( x=0; x<allColumns.length; x++ ){
[% FOREACH not_deleted_loo IN not_deleted_loop %]
<tr>
<td>[% not_deleted_loo.itemnumber %]</td>
- <td>[% IF ( not_deleted_loo.CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% not_deleted_loo.biblionumber %]&itemnumber=[% not_deleted_loo.itemnumber %]">[% not_deleted_loo.barcode %]</a>[% ELSE %][% not_deleted_loo.barcode %][% END %]</td>
+ <td>[% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% not_deleted_loo.biblionumber %]&itemnumber=[% not_deleted_loo.itemnumber %]">[% not_deleted_loo.barcode %]</a>[% ELSE %][% not_deleted_loo.barcode %][% END %]</td>
<td>[% IF ( not_deleted_loo.book_on_loan ) %]Item is checked out[% ELSIF ( not_deleted_loo.book_reserved ) %]Item has a waiting hold[% END %]</td>
</tr>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 5fcd283..461b6bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -100,7 +100,7 @@ for( x=0; x<allColumns.length; x++ ){
<ul>
[% FOREACH simple_items_displa IN simple_items_display %]
<li>
- [% IF ( simple_items_displa.CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% simple_items_displa.biblionumber %]&itemnumber=[% simple_items_displa.itemnumber %]">[% simple_items_displa.barcode %]</a>[% ELSE %][% simple_items_displa.barcode %][% END %]
+ [% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% simple_items_displa.biblionumber %]&itemnumber=[% simple_items_displa.itemnumber %]">[% simple_items_displa.barcode %]</a>[% ELSE %][% simple_items_displa.barcode %][% END %]
</li>
[% END %]
</ul>
--
1.7.3
More information about the Koha-patches
mailing list