From 901120213f380055391923120d8c0ecf0049cd63 Mon Sep 17 00:00:00 2001 From: David Flater Date: Mon, 7 Jul 2025 15:17:54 +0000 Subject: [PATCH] Bug 32682: Implement reading history permission --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 10 ++++------ .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/includes/permissions.inc | 3 +++ .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 9eb6432712..60e05901e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -188,12 +188,10 @@ [% END %] [% END %] - [% IF CAN_user_borrowers_edit_borrowers %] - [% IF ( intranetreadinghistory ) %] -
  • - Circulation history -
  • - [% END %] + [% IF CAN_user_borrowers_view_checkout_history %] +
  • + Circulation history +
  • [% END %] [% IF CAN_user_borrowers_edit_borrowers %] [% IF ( IntranetReadingHistoryHolds ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index c40f34ebce..18c9f348fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -151,7 +151,7 @@ [% END %] [% END %] - [% IF Koha.Preference('intranetreadinghistory') %] + [% IF CAN_user_borrowers_view_checkout_history %] [% IF ( patron.privacy == 2 ) %]
  • Export today's checked in barcodes diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index a0e17a2d41..8d59349f16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -311,6 +311,9 @@ [%- CASE 'edit_accountline_notes' -%] Edit accountline notes ([% name | html %]) + [%- CASE 'view_checkout_history' -%] + Viewing checkout history + ([% name | html %]) [%- CASE 'suggestions_manage' -%] Edit purchase suggestions ([% name | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index 409f57721b..91e021ff02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -41,7 +41,7 @@

    Checkout history for [% INCLUDE 'biblio-title.inc' %]

    [% IF biblio.author %]

    by [% biblio.author | html %]

    [% END %] - [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] + [% SET show_patron_column = CAN_user_borrowers_view_checkout_history) AND CAN_user_circulate_circulate_remaining_permissions %]
    [% IF checkouts %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 9166f33f12..3ddd2144e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -46,7 +46,7 @@ [% UNLESS checkouts %][% checkouts = [] %][% END %] [% UNLESS old_checkouts %][% old_checkouts = [] %][% END %] [% SET all_checkouts = checkouts.merge(old_checkouts) %] - [% UNLESS Koha.Preference('intranetreadinghistory') %] + [% UNLESS CAN_user_borrowers_view_checkout_history %]
    Staff members are not allowed to access patron's checkout history
    [% ELSIF is_anonymous %]
    This is the anonymous patron, so no circulation history is displayed. To get a list of anonymized loans, please run a report.
    -- 2.39.5