Bug 6158: Permissions scoped wrong for T::T

Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Jared Camins-Esakov 2011-04-11 12:17:39 -04:00 committed by Chris Cormack
parent 6668bf06f8
commit 66fb80f436
10 changed files with 23 additions and 23 deletions

View File

@ -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 %]

View File

@ -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 %]&amp;op=add_form">New basket</a>
[% ELSE %]

View File

@ -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&amp;biblionumber=[% ITEM_DAT.biblionumber %]&amp;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 %]&nbsp;</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 %]&nbsp;</li>
<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</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" />

View File

@ -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&amp;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&amp;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 %]

View File

@ -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&amp;id=[% koha_new.idnew %]">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;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 -->

View File

@ -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 %]&amp;phase=Show%20SQL">Show</a>
[% IF ( savedreport.CAN_user_reports_create_reports ) %]
[% IF ( CAN_user_reports_create_reports ) %]
&nbsp; <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL">Edit</a>
[% END %]
</td>
<td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;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 %]&amp;phase=Delete%20Saved">Delete</a></td>
[% END %]
</tr>

View File

@ -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>&nbsp;</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>&nbsp;</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&amp;where=up&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;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&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]">
[% IF ( reserveloo.lowestPriority ) %]

View File

@ -129,7 +129,7 @@ Serials updated :
[% IF ( subscription.cannotedit ) %]
&nbsp;
[% ELSE %]
[% IF ( subscription.CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;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 %]&amp;serstatus=1,3,7">Serial receive</a>[% END %]
[% END %]
</td>
</tr>

View File

@ -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&amp;biblionumber=[% not_deleted_loo.biblionumber %]&amp;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&amp;biblionumber=[% not_deleted_loo.biblionumber %]&amp;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 %]

View File

@ -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&amp;biblionumber=[% simple_items_displa.biblionumber %]&amp;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&amp;biblionumber=[% simple_items_displa.biblionumber %]&amp;itemnumber=[% simple_items_displa.itemnumber %]">[% simple_items_displa.barcode %]</a>[% ELSE %][% simple_items_displa.barcode %][% END %]
</li>
[% END %]
</ul>