From 5b4225e4c77ea54fce86524612bfe60f1e45b70c Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 19 Nov 2025 19:54:20 +0000 Subject: [PATCH] Bug 34069: Fix categorycode/branch info, open in new tab, and other fixes Signed-off-by: Katie Bliss --- .../intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +++ .../intranet-tmpl/prog/en/modules/members/deletemem.tt | 1 - .../prog/en/modules/tools/restore_deleted_borrowers.tt | 10 +++++----- tools/restore_deleted_borrowers.pl | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) 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 d436580537f..04538627dcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -15,6 +15,9 @@ [% IF (CAN_user_clubs) %]
  • Patron clubs
  • [% END %] + [% IF ( CAN_user_tools_restore_deleted_borrowers && Koha.Preference('AllowDeletedPatronRestoration') ) %] +
  • Restore deleted patrons
  • + [% END %] [% IF ( CAN_user_tools_moderate_comments ) %]
  • Comments
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt index a345c395d87..8db47e13e4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -69,7 +69,6 @@ [% END %]

    Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]?

    -

    This cannot be undone.

    [% INCLUDE 'csrf-token.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt index 21c684788ed..08e7814683c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt @@ -195,8 +195,8 @@ [% patron.borrowernumber | html %] [% patron.surname | html %] [% patron.firstname | html %] - [% patron.category.description | html %] - [% patron.library.branchname | html %] + [% Categories.GetName( patron.categorycode ) | html %] + [% Branches.GetName( patron.branchcode ) | html %] [% patron.updated_on | $KohaDates %] [% END %] @@ -240,10 +240,10 @@ [% patron.cardnumber | html %] [% patron.borrowernumber | html %] [% patron.firstname | html %] [% patron.surname | html %] - [% patron.category.description | html %] - [% patron.library.branchname | html %] + [% Categories.GetName( patron.categorycode ) | html %] + [% Branches.GetName( patron.branchcode ) | html %] - View patron + View patron [% END %] diff --git a/tools/restore_deleted_borrowers.pl b/tools/restore_deleted_borrowers.pl index 79946512722..417b5e15087 100755 --- a/tools/restore_deleted_borrowers.pl +++ b/tools/restore_deleted_borrowers.pl @@ -136,6 +136,7 @@ if ( $op eq 'search' ) { email => $patron->email, branchcode => $patron->branchcode, updated_on => $patron->updated_on, + categorycode => $patron->categorycode, }; push @deleted_patrons, $patron_data; @@ -181,6 +182,8 @@ if ( $op eq 'search' ) { cardnumber => $restored_patron->cardnumber, firstname => $restored_patron->firstname, surname => $restored_patron->surname, + branchcode => $restored_patron->branchcode, + categorycode => $restored_patron->categorycode, }; } catch { push @errors, "Error restoring borrower $borrowernumber: $_"; -- 2.39.5