From 66fb80f4362882e82cdcea5caa4341a51d61fb49 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Mon, 11 Apr 2011 12:17:39 -0400 Subject: [PATCH] Bug 6158: Permissions scoped wrong for T::T Permission flags should always have absolute scope. Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack --- .../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 5c796eeac3..da64ca41f0 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 a54a99df12..842f75dd40 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 %] [% END %] - [% IF ( loop_supplier.CAN_user_acquisition_order_manage ) %] + [% IF ( CAN_user_acquisition_order_manage ) %] [% IF ( loop_supplier.active ) %] New basket [% 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 2a67599d5e..86c8a3f59f 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 %]

Barcode [% ITEM_DAT.barcode %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext %] [% END %]

-

Item Information [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %] - [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_items ) %] +

Item Information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] [Edit Item] [% END %] [% END %][% END %]

@@ -71,7 +71,7 @@
  • Current Renewals: [% ITEM_DAT.renewals %] 
    • [% IF ( ITEM_DAT.itemlostloop ) %]
  • Lost Status: - [% IF ( ITEM_DAT.CAN_user_circulate ) %] + [% IF ( CAN_user_circulate ) %]
    @@ -101,7 +101,7 @@ [% END %] [% IF ( ITEM_DAT.itemdamagedloop ) %]
  • Damaged Status: - [% IF ( ITEM_DAT.CAN_user_circulate ) %] + [% IF ( CAN_user_circulate ) %] @@ -130,7 +130,7 @@
    • [% END %]
  • Withdrawn?:[% IF ( ITEM_DAT.wthdrawn ) %]Yes[% ELSE %]No[% END %] - [% IF ( ITEM_DAT.CAN_user_circulate ) %] + [% IF ( CAN_user_circulate ) %] @@ -152,7 +152,7 @@
    1. - [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_catalogue ) %] + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] Accession Date: [% IF ( ITEM_DAT.basketno ) %] @@ -175,7 +175,7 @@
    2. Paid for?: [% ITEM_DAT.paidfor %] 
    3. Serial enumeration: [% ITEM_DAT.enumchron %] 
    4. Public Note: - [% IF ( ITEM_DAT.CAN_user_editcatalogue_edit_items ) %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] 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 8a533ba390..f5e371252b 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 @@ MARC | Card - [% IF ( resultsloo.CAN_user_editcatalogue_edit_catalogue ) %]Edit biblio[% END %] - [% IF ( resultsloo.CAN_user_editcatalogue_edit_items ) %]Add/Edit Items[% END %] + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]Edit biblio[% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %]Add/Edit Items[% END %] [% END %] @@ -142,7 +142,7 @@ MARC | Card - Add biblio + Add biblio [% 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 e83f20eb05..e43e164b6d 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 %]

      [% koha_new.title %]

      [% koha_new.new %]

      -

      Posted on [% koha_new.newdate %] [% IF ( koha_new.CAN_user_tools ) %] +

      Posted on [% koha_new.newdate %] [% IF ( CAN_user_tools ) %] Edit | Delete | New[% END %]

      [% END %]
    • 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 68e65e95b6..31fd512421 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.

    Show - [% IF ( savedreport.CAN_user_reports_create_reports ) %] + [% IF ( CAN_user_reports_create_reports ) %]   Edit [% END %] Run Schedule - [% IF ( savedreport.CAN_user_reports_create_reports ) %] + [% IF ( CAN_user_reports_create_reports ) %] Delete [% END %] 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 43b6cd1ff9..2c392b0770 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() { [% biblioloo.title |html %] [% END %] - [% IF ( biblioloo.CAN_user_reserveforothers_modify_holds_priority ) %] + [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] Priority   [% ELSE %] @@ -582,7 +582,7 @@ function checkMultiHold() { Expiration Pick up Library Details - [% IF ( biblioloo.CAN_user_reserveforothers_modify_holds_priority ) %] + [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] Toggle Set to Lowest Priority [% END %]   @@ -600,14 +600,14 @@ function checkMultiHold() { [% 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 ) %][% ELSE %][% END %] [% END %][% ELSE %][% END %] - [% IF ( reserveloo.CAN_user_reserveforothers_modify_holds_priority ) %] + [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] Go up @@ -699,7 +699,7 @@ function checkMultiHold() { [% END %] - [% IF ( reserveloo.CAN_user_reserveforothers_modify_holds_priority ) %] + [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] [% 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 207f831097..56a8214920 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 ) %]Serial receive[% END %] + [% IF ( CAN_user_serials_receive_serials ) %]Serial receive[% END %] [% END %] 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 20d04a761d..21013f5a0d 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 [% not_deleted_loo.itemnumber %] - [% IF ( not_deleted_loo.CAN_user_editcatalogue_edit_items ) %][% not_deleted_loo.barcode %][% ELSE %][% not_deleted_loo.barcode %][% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %][% not_deleted_loo.barcode %][% ELSE %][% not_deleted_loo.barcode %][% END %] [% IF ( not_deleted_loo.book_on_loan ) %]Item is checked out[% ELSIF ( not_deleted_loo.book_reserved ) %]Item has a waiting hold[% END %] [% 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 5fcd2833a1..461b6bcacb 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 [% FOREACH simple_items_displa IN simple_items_display %]
  • - [% IF ( simple_items_displa.CAN_user_editcatalogue_edit_items ) %][% simple_items_displa.barcode %][% ELSE %][% simple_items_displa.barcode %][% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %][% simple_items_displa.barcode %][% ELSE %][% simple_items_displa.barcode %][% END %]
    • [% END %] -- 2.39.5