From af56c6c7529f9ba638dffb6d6be7f2f994915a80 Mon Sep 17 00:00:00 2001 From: Nicolas Hunstein Date: Mon, 24 Feb 2025 15:32:36 +0000 Subject: [PATCH] Bug 38687: update "batch modify due dates" and description "Modify the due date checkouts in batch" to test: - go to Tool - check designation and description of "batch modify due date" - verify designation ist "batch modify due date" and description is "Modify the due date checkouts in batch" - apply patch - verify instead of "batch modify due date" it is now "Batch modify due dates" and instead of "Modify the due date checkouts in batch" it is "Modify checkout due dates in batch" --- .../data/mysql/mandatory/userpermissions.sql | 2 +- .../prog/en/includes/permissions.inc | 4 ++-- .../prog/en/includes/tools-menu.inc | 4 ++-- .../en/modules/tools/batch_extend_due_dates.tt | 16 ++++++++-------- .../prog/en/modules/tools/tools-home.tt | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql index 1d8b7d034f2..193a6f12087 100644 --- a/installer/data/mysql/mandatory/userpermissions.sql +++ b/installer/data/mysql/mandatory/userpermissions.sql @@ -110,7 +110,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'import_patrons', 'Import patron data'), (13, 'edit_patrons', 'Perform batch modification of patrons'), (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower checkout history)'), - (13, 'batch_extend_due_dates', 'Perform batch extend due dates'), + (13, 'batch_modify_due_dates', 'Perform batch modify due dates'), (13, 'batch_upload_patron_images', 'Upload patron images in a batch or one at a time'), (13, 'schedule_tasks', 'Schedule tasks to run'), (13, 'items_batchmod', 'Perform batch modification of items'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index 4ca590e4b8d..99e8a1722f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -362,8 +362,8 @@ [%- CASE 'delete_anonymize_patrons' -%] Delete old borrowers and anonymize circulation history (deletes borrower checkout history) ([% name | html %]) - [%- CASE 'batch_extend_due_dates' -%] - Perform batch extend due dates + [%- CASE 'batch_modify_due_dates' -%] + Perform batch modify due dates ([% name | html %]) [%- CASE 'edit_calendar' -%] Define days when the library is closed 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 28cd71f6b7c..9cae6653814 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -36,8 +36,8 @@ [% IF ( CAN_user_tools_edit_patrons ) %]
  • Batch patron modification
  • [% END %] - [% IF ( CAN_user_tools_batch_extend_due_dates ) %] -
  • Batch extend due dates
  • + [% IF ( CAN_user_tools_batch_modify_due_dates ) %] +
  • Batch modify due dates
  • [% END %] [% IF ( CAN_user_tools_moderate_tags ) %]
  • Tags
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt index e4188a8edc8..a0e04e72b21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -18,7 +18,7 @@ [% t("Results") | html %] › [% END %] - [% t("Batch extend due dates") | html %] + [% t("Batch modify due dates") | html %] › [% t("Tools") | html %] › [% t("Koha") | html %] [% END %] @@ -26,7 +26,7 @@ [% Asset.css("css/humanmsg.css") | $raw %] - + [% WRAPPER 'header.inc' %] [% INCLUDE 'cat-search.inc' %] [% END %] @@ -38,11 +38,11 @@ [% END %] [% IF ( view == 'list' || view == 'report' ) %] [% WRAPPER breadcrumb_item %] - Batch extend due dates + Batch modify due dates [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Batch extend due dates + Batch modify due dates [% END %] [% END %] [% IF ( view == 'list' ) %] @@ -58,7 +58,7 @@ [% END #/ WRAPPER sub-header.inc %] [% WRAPPER 'main-container.inc' aside='tools-menu' %] -

    Batch extend due dates

    +

    Batch modify due dates

    [% IF ( messages ) %]
    @@ -81,7 +81,7 @@ [% END %] [% IF view == 'form' %] -
    + [% INCLUDE 'csrf-token.inc' %]
    Checkout criteria: @@ -154,7 +154,7 @@ Cancel
    - + [% ELSIF view == 'list' %] [% IF checkouts.count %]
    @@ -287,7 +287,7 @@ paginate: false, }); - $("#extend_due_dates_form").on("submit", function (e) { + $("#modify_due_dates_form").on("submit", function (e) { var new_hard_due_date = $("#new_hard_due_date").val(); var due_date_days = $("#due_date_days").val(); if (new_hard_due_date && due_date_days) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index bf1d14de861..d1219227026 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -29,7 +29,7 @@

    Tools

    - [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || CAN_user_tools_rotating_collections || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] + [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_batch_modify_due_dates || CAN_user_tools_moderate_tags || CAN_user_tools_rotating_collections || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]

    Patrons and circulation

    [% END %]
    @@ -83,8 +83,8 @@
    Modify patrons in batch
    [% END %] - [% IF ( CAN_user_tools_batch_extend_due_dates ) %] -
    Batch extend due dates
    + [% IF ( CAN_user_tools_batch_modify_due_dates ) %] +
    Batch modify due dates
    Modify the due date checkouts in batch
    [% END %] -- 2.39.5