Bugzilla – Attachment 194038 Details for
Bug 40504
ILL requests should have ability to assign staff to manage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40504: (QA follow-up): Add prettier-ignore to process blocks
d560f94.patch (text/plain), 88.48 KB, created by
Lisette Scheer
on 2026-02-26 18:07:27 UTC
(
hide
)
Description:
Bug 40504: (QA follow-up): Add prettier-ignore to process blocks
Filename:
MIME Type:
Creator:
Lisette Scheer
Created:
2026-02-26 18:07:27 UTC
Size:
88.48 KB
patch
obsolete
>From d560f94f8c2611dedeec62bb67ed644daa0f9fa8 Mon Sep 17 00:00:00 2001 >From: Lisette Scheer <lisette@bywatersolutions.com> >Date: Thu, 26 Feb 2026 17:38:01 +0000 >Subject: [PATCH] Bug 40504: (QA follow-up): Add prettier-ignore to process > blocks > >--- > ill/ill-requests.pl | 4 +- > .../prog/en/includes/select_manager.inc | 19 +- > .../prog/en/modules/ill/ill-requests.tt | 1173 ++++++++--------- > .../prog/en/modules/suggestion/suggestion.tt | 32 +- > 4 files changed, 603 insertions(+), 625 deletions(-) > >diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl >index b5d6c9490dc..5d74a75d17e 100755 >--- a/ill/ill-requests.pl >+++ b/ill/ill-requests.pl >@@ -144,12 +144,12 @@ if ($backends_available) { > $op = 'historycheck'; > $template->param( $history_check->history_check_template_params($params) ) > >- # ILLCheckAvailability operation >+ # ILLCheckAvailability operation > } elsif ( $availability->show_availability($request) ) { > $op = 'availability'; > $template->param( $availability->availability_template_params($params) ) > >- # ILLModuleDisclaimerByType operation >+ # ILLModuleDisclaimerByType operation > } elsif ( $type_disclaimer->show_type_disclaimer($request) ) { > $op = 'typedisclaimer'; > $template->param( $type_disclaimer->type_disclaimer_template_params($params) ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >index a2fe25ea513..301ab0d3a15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >@@ -1,21 +1,12 @@ > [% PROCESS 'patron-search.inc' %] >+ > [% IF add_modal %] > [% SET columns = ['cardnumber','name','category','branch','action'] %] > [% SET filter = filter %] >- [% PROCESS patron_search_modal >- columns => columns, >- modal_title => t("Select manager"), >- patron_search_modal_id => 'patron_search_modal_manager', >- table_id => 'patron_search_modal_manager_table' >- %] >- [% PROCESS patron_search_js >- columns => columns, >- actions => ["select"], >- preview_on_name_click => 1, >- table_id => 'patron_search_modal_manager_table', >- callback => 'select_manager' >- empty_table_settings => 1 >- %] >+ [%# prettier-ignore-start %] >+ [% PROCESS patron_search_modal columns => columns, modal_title => t("Select manager"), table_id => 'patron_search_modal_manager_table' %] >+ [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1, table_id => 'patron_search_modal_manager_table', callback => 'select_manager' empty_table_settings => 1 %] >+ [%# prettier-ignore-end %] > [% END %] > <script> > function select_manager(borrowernumber, borrower) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index e3e0daf8160..672716a6613 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -80,581 +80,578 @@ > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >- > [% WRAPPER 'main-container.inc' wide_centered => ( op == 'illlist' ? 0 : 1 ) aside = ( op == 'illlist' ? 'ill-filter' : '' ) %] > >- [% IF op == 'illlist' %] >- <script> >- var ill_table_actions = [% table_actions | $raw %]; >- </script> >- [% END %] >+[% IF op == 'illlist' %] >+ <script> >+ var ill_table_actions = [% table_actions | $raw %]; >+ </script> >+[% END %] > >- <div id="interlibraryloans"> >- [% IF !backends_available || !has_branch || ill_deprecated_backend_freeform_is_installed %] >- <div class="alert alert-info">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl?tab=sysinfo">about page</a></div> >- [% ELSE %] >- [% INCLUDE 'ill-toolbar.inc' %] >- [% INCLUDE 'ill-batch-modal.inc' %] >+<div id="interlibraryloans"> >+ [% IF !backends_available || !has_branch || ill_deprecated_backend_freeform_is_installed %] >+ <div class="alert alert-info">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl?tab=sysinfo">about page</a></div> >+ [% ELSE %] >+ [% INCLUDE 'ill-toolbar.inc' %] >+ [% INCLUDE 'ill-batch-modal.inc' %] > >- [% IF whole.error %] >- <h1>Error performing operation</h1> >- <!-- Dispatch on Status --> >- <p>We encountered an error:</p> >- <p> >- [% SWITCH whole.status %] >- [% CASE 'invalid_patron' %] >- <pre>The patron ID you entered is invalid.</pre> >- [% CASE 'invalid_biblio' %] >- <pre>The bibliographic record ID you entered is invalid.</pre> >- [% CASE %] >- <pre>[% whole.message | html %] ([% whole.status | html %])</pre> >- [% END %] >- </p> >- [% END %] >+ [% IF whole.error %] >+ <h1>Error performing operation</h1> >+ <!-- Dispatch on Status --> >+ <p>We encountered an error:</p> >+ <p> >+ [% SWITCH whole.status %] >+ [% CASE 'invalid_patron' %] >+ <pre>The patron ID you entered is invalid.</pre> >+ [% CASE 'invalid_biblio' %] >+ <pre>The bibliographic record ID you entered is invalid.</pre> >+ [% CASE %] >+ <pre>[% whole.message | html %] ([% whole.status | html %])</pre> >+ [% END %] >+ </p> >+ [% END %] > >- [% IF whole.success %] >- <p>[% whole.success | html %]</p> >- [% END %] >+ [% IF whole.success %] >+ <p>[% whole.success | html %]</p> >+ [% END %] > >- [% IF op == 'cud-create' %] >- <h1>New ILL request</h1> >- [% PROCESS $whole.template %] >- [% ELSIF op == 'confirm' %] >- <h1>Confirm ILL request</h1> >- [% PROCESS $whole.template %] >- [% ELSIF op == 'mark_completed' %] >- <h1>Complete ILL request</h1> >- <p>Proceeding with this action will set this request to 'Completed'.</p> >- <p>You can select a status alias from the available options:</p> >- [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] >- [% proceed_url = base_url _ "?method=mark_completed&stage=complete" _ "&illrequest_id=" _ request.illrequest_id %] >- <form action="[% proceed_url | url %]" method="get"> >- <select name="status_alias"> >- <option value="" selected></option> >- [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %] >- <option value="[% alias.authorised_value | html %]"> [% alias.lib | html %] </option> >- [% END %] >- </select> >- <input type="hidden" name="method" value="mark_completed" /> >- <input type="hidden" name="stage" value="complete" /> >- <input type="hidden" name="illrequest_id" value="[% request.illrequest_id | html %]" /> >- <fieldset class="action"> >- <button type="submit" class="btn btn-sm btn-primary">Complete request</button> >- <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a> >- </fieldset> >- </form> >- [% ELSIF op == 'cud-cancel' and !whole.error %] >- <h1>Cancel a confirmed request</h1> >- [% PROCESS $whole.template %] >- [% ELSIF op == 'check_out' and !whole.error %] >- [% IF !whole.stage || whole.stage == 'form' %] >- <h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1> >- [% IF !request.biblio_id || request.biblio_id.length == 0 %] >- <div class="alert alert-warning">This item cannot be checked out as it has no bibliographic record associated with it</div> >- [% END %] >- [% IF whole.value.errors.itemcount %] >- <div class="alert alert-warning">The bibliographic record for this request has multiple items, it should only have one. Please fix this then try again.</div> >- [% END %] >- [% IF whole.value.errors.item_creation %] >- <div class="alert alert-warning">An unknown error occurred while trying to add an item</div> >- [% END %] >- [% IF whole.value.errors.item_check_out %] >- <div class="alert alert-warning">An unknown error occurred while trying to check out the item</div> >- [% END %] >- [% IF whole.value.check_out_errors %] >- [% IF whole.value.check_out_errors.error.STATS %] >- <div class="alert alert-warning"> Local use recorded </div> >- [% ELSIF whole.value.check_out_errors.error.UNKNOWN_BARCODE %] >- <div class="alert alert-warning"> The bibliographic record's item contains an unknown (or empty) barcode. </div> >- [% ELSE %] >- <div class="alert alert-warning"> >- There was a problem checking this item out, please check for problems with the <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% whole.value.patron.borrowernumber | uri %]">patron's account</a> >- </div> >- [% END %] >- [% END %] >- [% IF request.biblio_id && request.biblio_id.length > 0 && !whole.value.check_out_errors.error.STATS %] >- <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl"> >- [% INCLUDE 'csrf-token.inc' %] >- <fieldset class="rows"> >- <legend>Check out details</legend> >- [% items = whole.value.biblio.items.unblessed %] >- [% IF items.size == 1 %] >- <p >- ><a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% whole.value.biblio.biblionumber | uri %]">The bibliographic record</a> for this request already has an item attached to it, >- you are about to check it out</p >- > >- [% ELSE %] >- <p>A bibliographic record for this request exists, but no item. You are about to create an item and check it out</p> >- [% END %] >- <ol> >- <li class="ill_checkout_inhouse"> >- <label for="inhouse" class="ill_checkout_inhouse_label">Statistical patron:</label> >- <select id="ill_checkout_inhouse_select" name="inhouse" class="ill_checkout_inhouse_select"> >- <option value=""></option> >- [% FOREACH stat IN whole.value.statistical %] >- [% IF stat.borrowernumber == params.inhouse %] >- <option value="[% stat.cardnumber | html %]" selected>[% INCLUDE 'patron-title.inc' patron = stat %]</option> >- [% ELSE %] >- <option value="[% stat.cardnumber | html %]">[% INCLUDE 'patron-title.inc' patron = stat %]</option> >- [% END %] >- [% END %] >- </select> >- [% IF whole.value.errors.inhouse %] >- <span class="required">You must choose a valid patron</span> >- [% END %] >- <div class="hint" >- >If you do not wish to check out the item to [% INCLUDE 'patron-title.inc' patron = request.patron %] and would rather issue it to an in-house statistical patron, choose the patron here</div >- > >- </li> >- <li class="ill_checkout_item_type"> >- <label for="item_type" class="ill_checkout_item_type_label required">Item type:</label> >- [% IF items.size != 1 %] >- <select id="ill_checkout_item_type_select" name="item_type" required> >- [% FOREACH type IN whole.value.itemtypes %] >- <option value="[% type.itemtype | html %]" [% IF type.itemtype == params.item_type %]selected[% END %]> [% type.description | html %] </option> >- [% END %] >- </select> >- [% ELSE %] >- [% FOREACH type IN whole.value.itemtypes %] >- [% IF type.itemtype == items.0.itype %] >- [% type.description | html %] >- [% END %] >- [% END %] >- [% END %] >- [% IF whole.value.errors.item_type %] >- <span class="required">You must choose an item type</span> >- [% END %] >- </li> >- [% IF items.size == 1 %] >- <li> >- <label for="barcode" class="ill_checkout_barcode_label">Item barcode:</label> >- [% items.0.barcode | html %] >- </li> >- [% END %] >- <li class="ill_checkout_branchcode"> >- <label for="branchcode" class="ill_checkout_branchcode_label required">Library:</label> >- [% branchcode = items.size == 1 ? items.0.homebranch : params.branchcode ? params.branchcode : request.branchcode %] >- [% IF items.size != 1 %] >- <select name="branchcode" id="ill_checkout_branchcode_select" required> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %] >- </select> >- [% ELSE %] >- [% FOREACH branch IN whole.value.libraries.unblessed %] >- [% IF branch.branchcode == branchcode %] >- [% branch.branchname | html %] >- [% END %] >- [% END %] >- [% END %] >- [% IF whole.value.errors.branchcode %] >- <span class="required">You must choose a library</span> >- [% END %] >- </li> >- <li class="ill_checkout_due_date"> >- <label for="duedate" class="ill_checkout_duedate_label">Due date:</label> >- <input name="duedate" id="ill_checkout_duedate_input" type="text" value="[% params.duedate | html %]" class="flatpickr" data-flatpickr-enable-time="true" /> [% INCLUDE 'date-format.inc' %] >- <div class="hint">If you do not specify a due date, it will be set according to circulation rules</div> >- </li> >- </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="hidden" value="cud-check_out" name="op" /> >- <input type="hidden" value="form" name="stage" /> >- [% IF items.size == 1 %] >- <input name="branchcode" type="hidden" value="[% branchcode | html %]" /> >- <input name="item_type" type="hidden" value="[% items.0.itype | html %]" /> >- [% END %] >- <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> >- <input type="submit" class="btn btn-primary" value="Submit" /> >- <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Cancel</a> >- </fieldset> >- </form> >+ [% IF op == 'cud-create' %] >+ <h1>New ILL request</h1> >+ [% PROCESS $whole.template %] >+ [% ELSIF op == 'confirm' %] >+ <h1>Confirm ILL request</h1> >+ [% PROCESS $whole.template %] >+ [% ELSIF op == 'mark_completed' %] >+ <h1>Complete ILL request</h1> >+ <p>Proceeding with this action will set this request to 'Completed'.</p> >+ <p>You can select a status alias from the available options:</p> >+ [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] >+ [% proceed_url = base_url _ "?method=mark_completed&stage=complete" _ "&illrequest_id=" _ request.illrequest_id %] >+ <form action="[% proceed_url | url %]" method="get"> >+ <select name="status_alias"> >+ <option value="" selected></option> >+ [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %] >+ <option value="[% alias.authorised_value | html %]"> [% alias.lib | html %] </option> > [% END %] >- [% IF whole.value.check_out_errors.error.STATS %] >- <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Return to request</a> >- [% END %] >- [% ELSIF whole.stage == 'done_check_out' %] >- <h1>Item checked out</h1> >- <fieldset class="rows"> >- <legend>Check out details</legend> >- <ol> >- <li> >- <label>Checked out to:</label> >- [% INCLUDE 'patron-title.inc' patron = whole.value.patron %] >- </li> >- <li> >- <label>Due date:</label> >- [% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %] >- </li> >- </ol> >- </fieldset> >- <fieldset class="action"> >- <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Return to request</a> >- </fieldset> >+ </select> >+ <input type="hidden" name="method" value="mark_completed" /> >+ <input type="hidden" name="stage" value="complete" /> >+ <input type="hidden" name="illrequest_id" value="[% request.illrequest_id | html %]" /> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-sm btn-primary">Complete request</button> >+ <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a> >+ </fieldset> >+ </form> >+ [% ELSIF op == 'cud-cancel' and !whole.error %] >+ <h1>Cancel a confirmed request</h1> >+ [% PROCESS $whole.template %] >+ [% ELSIF op == 'check_out' and !whole.error %] >+ [% IF !whole.stage || whole.stage == 'form' %] >+ <h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1> >+ [% IF !request.biblio_id || request.biblio_id.length == 0 %] >+ <div class="alert alert-warning">This item cannot be checked out as it has no bibliographic record associated with it</div> > [% END %] >- [% ELSIF op == 'generic_confirm' %] >- <h1>Place request with partner libraries</h1> >- [% IF error %] >- [% IF error == 'no_target_email' %] >- <div class="alert alert-warning"> No target email addresses found. Either select at least one partner or check your ILL partner library records. </div> >- [% ELSIF error == 'no_library_email' %] >- <div class="alert alert-warning"> Your library has no usable email address. Please set it. </div> >- [% ELSIF error == 'unkown_error' %] >- <div class="alert alert-warning"> Unknown error processing your request. Contact your administrator. </div> >+ [% IF whole.value.errors.itemcount %] >+ <div class="alert alert-warning">The bibliographic record for this request has multiple items, it should only have one. Please fix this then try again.</div> >+ [% END %] >+ [% IF whole.value.errors.item_creation %] >+ <div class="alert alert-warning">An unknown error occurred while trying to add an item</div> >+ [% END %] >+ [% IF whole.value.errors.item_check_out %] >+ <div class="alert alert-warning">An unknown error occurred while trying to check out the item</div> >+ [% END %] >+ [% IF whole.value.check_out_errors %] >+ [% IF whole.value.check_out_errors.error.STATS %] >+ <div class="alert alert-warning"> Local use recorded </div> >+ [% ELSIF whole.value.check_out_errors.error.UNKNOWN_BARCODE %] >+ <div class="alert alert-warning"> The bibliographic record's item contains an unknown (or empty) barcode. </div> >+ [% ELSE %] >+ <div class="alert alert-warning"> >+ There was a problem checking this item out, please check for problems with the <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% whole.value.patron.borrowernumber | uri %]">patron's account</a> >+ </div> > [% END %] > [% END %] >- <!-- Start of GENERIC_EMAIL case --> >- [% IF whole.value.partners %] >- [% ill_url = "/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=" _ request.illrequest_id %] >+ [% IF request.biblio_id && request.biblio_id.length > 0 && !whole.value.check_out_errors.error.STATS %] > <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl"> > [% INCLUDE 'csrf-token.inc' %] > <fieldset class="rows"> >- <legend>Interlibrary loan request details</legend> >+ <legend>Check out details</legend> >+ [% items = whole.value.biblio.items.unblessed %] >+ [% IF items.size == 1 %] >+ <p >+ ><a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% whole.value.biblio.biblionumber | uri %]">The bibliographic record</a> for this request already has an item attached to it, you >+ are about to check it out</p >+ > >+ [% ELSE %] >+ <p>A bibliographic record for this request exists, but no item. You are about to create an item and check it out</p> >+ [% END %] > <ol> >- <li> >- <label for="partner_filter">Filter partner libraries:</label> >- <input type="text" id="partner_filter" /> >- </li> >- <li> >- <label for="partners" class="required">Select partner libraries:</label> >- <select size="5" multiple="true" id="partners" name="partners" required="required"> >- [% FOREACH partner IN whole.value.partners %] >- [% IF partner.email && partner.email.length > 0 %] >- <option data-partner-id="[% partner.id | html %]" value="[% partner.borrowernumber | html %]"> [% partner.branchcode _ " - " _ partner.surname %] </option> >+ <li class="ill_checkout_inhouse"> >+ <label for="inhouse" class="ill_checkout_inhouse_label">Statistical patron:</label> >+ <select id="ill_checkout_inhouse_select" name="inhouse" class="ill_checkout_inhouse_select"> >+ <option value=""></option> >+ [% FOREACH stat IN whole.value.statistical %] >+ [% IF stat.borrowernumber == params.inhouse %] >+ <option value="[% stat.cardnumber | html %]" selected>[% INCLUDE 'patron-title.inc' patron = stat %]</option> >+ [% ELSE %] >+ <option value="[% stat.cardnumber | html %]">[% INCLUDE 'patron-title.inc' patron = stat %]</option> > [% END %] > [% END %] > </select> >- [% IF Koha.Preference('ILLCheckAvailability') %] >- <div id="generic_confirm_search_count">Partners available for searching: <span id="generic_confirm_enabled">none</span></div> >- <div id="generic_confirm_search"> >- <button type="button">Search selected partners</button> >- </div> >+ [% IF whole.value.errors.inhouse %] >+ <span class="required">You must choose a valid patron</span> > [% END %] >+ <div class="hint" >+ >If you do not wish to check out the item to [% INCLUDE 'patron-title.inc' patron = request.patron %] and would rather issue it to an in-house statistical patron, choose the patron here</div >+ > > </li> >- <li> >- <label for="subject" class="required">Subject line:</label> >- <input type="text" name="subject" id="subject" type="text" value="[% whole.value.draft.subject | html %]" required="required" /> >+ <li class="ill_checkout_item_type"> >+ <label for="item_type" class="ill_checkout_item_type_label required">Item type:</label> >+ [% IF items.size != 1 %] >+ <select id="ill_checkout_item_type_select" name="item_type" required> >+ [% FOREACH type IN whole.value.itemtypes %] >+ <option value="[% type.itemtype | html %]" [% IF type.itemtype == params.item_type %]selected[% END %]> [% type.description | html %] </option> >+ [% END %] >+ </select> >+ [% ELSE %] >+ [% FOREACH type IN whole.value.itemtypes %] >+ [% IF type.itemtype == items.0.itype %] >+ [% type.description | html %] >+ [% END %] >+ [% END %] >+ [% END %] >+ [% IF whole.value.errors.item_type %] >+ <span class="required">You must choose an item type</span> >+ [% END %] >+ </li> >+ [% IF items.size == 1 %] >+ <li> >+ <label for="barcode" class="ill_checkout_barcode_label">Item barcode:</label> >+ [% items.0.barcode | html %] >+ </li> >+ [% END %] >+ <li class="ill_checkout_branchcode"> >+ <label for="branchcode" class="ill_checkout_branchcode_label required">Library:</label> >+ [% branchcode = items.size == 1 ? items.0.homebranch : params.branchcode ? params.branchcode : request.branchcode %] >+ [% IF items.size != 1 %] >+ <select name="branchcode" id="ill_checkout_branchcode_select" required> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %] >+ </select> >+ [% ELSE %] >+ [% FOREACH branch IN whole.value.libraries.unblessed %] >+ [% IF branch.branchcode == branchcode %] >+ [% branch.branchname | html %] >+ [% END %] >+ [% END %] >+ [% END %] >+ [% IF whole.value.errors.branchcode %] >+ <span class="required">You must choose a library</span> >+ [% END %] > </li> >- <li> >- <label for="body" class="required">Email text:</label> >- <textarea name="body" id="body" rows="20" cols="80" required="required">[% whole.value.draft.body | html %]</textarea> >+ <li class="ill_checkout_due_date"> >+ <label for="duedate" class="ill_checkout_duedate_label">Due date:</label> >+ <input name="duedate" id="ill_checkout_duedate_input" type="text" value="[% params.duedate | html %]" class="flatpickr" data-flatpickr-enable-time="true" /> [% INCLUDE 'date-format.inc' %] >+ <div class="hint">If you do not specify a due date, it will be set according to circulation rules</div> > </li> > </ol> >- <input type="hidden" value="cud-generic_confirm" name="op" /> >- <input type="hidden" value="draft" name="stage" /> >- <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> > </fieldset> > <fieldset class="action"> >- <input type="submit" class="btn btn-primary" value="Send email" /> >- <span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span> >+ <input type="hidden" value="cud-check_out" name="op" /> >+ <input type="hidden" value="form" name="stage" /> >+ [% IF items.size == 1 %] >+ <input name="branchcode" type="hidden" value="[% branchcode | html %]" /> >+ <input name="item_type" type="hidden" value="[% items.0.itype | html %]" /> >+ [% END %] >+ <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> >+ <input type="submit" class="btn btn-primary" value="Submit" /> >+ <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Cancel</a> > </fieldset> > </form> >- [% IF Koha.Preference('ILLCheckAvailability') %] >- <div id="partnerSearch" class="modal" tabindex="-1" role="dialog" aria-labelledby="partnerSearchLabel" aria-hidden="true"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <h1 class="modal-title" id="partnerSearchLabel"> Search partners</h1> >- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> >- </div> >- <div class="modal-body"> >- [% FOR service IN services %] >- <h4 class="ill_availability_sourcename">[% service.name | html %]</h4> >- [% INCLUDE 'ill-availability-table.inc' service=service %] >- [% END %] >- <span id="service_id_restrict" data-service_id_restrict_plugin="ILL availability - z39.50" data-service_id_restrict_ids=""></span> >- </div> >- <div class="modal-footer"> >- <button class="btn btn-default" data-bs-dismiss="modal">Close</button> >- </div> >- </div> >- </div> >- </div> >- [% END %] >- [% ELSE %] >- <fieldset class="rows"> >- <legend>Interlibrary loan request details</legend> >- <p>No partners have been defined yet. Please create appropriate patron records (by default IL category).</p> >- <p>Be sure to provide email addresses for these patrons.</p> >- <p >- ><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p >- > >- </fieldset> > [% END %] >- <!-- generic_confirm ends here --> >- [% ELSIF op == 'edit_action' %] >- <form method="POST" id="ill_edit_action_form" action="/cgi-bin/koha/ill/ill-requests.pl"> >+ [% IF whole.value.check_out_errors.error.STATS %] >+ <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Return to request</a> >+ [% END %] >+ [% ELSIF whole.stage == 'done_check_out' %] >+ <h1>Item checked out</h1> >+ <fieldset class="rows"> >+ <legend>Check out details</legend> >+ <ol> >+ <li> >+ <label>Checked out to:</label> >+ [% INCLUDE 'patron-title.inc' patron = whole.value.patron %] >+ </li> >+ <li> >+ <label>Due date:</label> >+ [% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %] >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="action"> >+ <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Return to request</a> >+ </fieldset> >+ [% END %] >+ [% ELSIF op == 'generic_confirm' %] >+ <h1>Place request with partner libraries</h1> >+ [% IF error %] >+ [% IF error == 'no_target_email' %] >+ <div class="alert alert-warning"> No target email addresses found. Either select at least one partner or check your ILL partner library records. </div> >+ [% ELSIF error == 'no_library_email' %] >+ <div class="alert alert-warning"> Your library has no usable email address. Please set it. </div> >+ [% ELSIF error == 'unkown_error' %] >+ <div class="alert alert-warning"> Unknown error processing your request. Contact your administrator. </div> >+ [% END %] >+ [% END %] >+ <!-- Start of GENERIC_EMAIL case --> >+ [% IF whole.value.partners %] >+ [% ill_url = "/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=" _ request.illrequest_id %] >+ <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl"> > [% INCLUDE 'csrf-token.inc' %] > <fieldset class="rows"> >- <legend>Request details</legend> >+ <legend>Interlibrary loan request details</legend> > <ol> >- [% type = request.get_type %] >- <li class="borrowernumber"> >- <label for="borrowernumber">Patron ID:</label> >- <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" /> >- </li> >- [% PROCESS select_manager_form >- manager => request.manager >- required_permission => CAN_user_ill >- %] >- <li class="biblio_id"> >- <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label> >- <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" /> >- </li> >- <li class="branchcode"> >- <label for="library" class="branchcode">Library:</label> >- <select name="branchcode" id="library"> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => request.branchcode ) %] >- </select> >+ <li> >+ <label for="partner_filter">Filter partner libraries:</label> >+ <input type="text" id="partner_filter" /> > </li> >- <li class="status"> >- <label class="status">Status:</label> >- [% stat = request.status %] >- [% current_alias = request.status_alias %] >- <select id="status_alias" name="status_alias"> >- <option value="" [% UNLESS current_alias %]selected[% END %]> [% request.capabilities.$stat.name | html %] </option> >- [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %] >- <option value="[% alias.authorised_value | html %]" [% IF alias.authorised_value == current_alias %]selected[% END %]> [% alias.lib | html %] </option> >+ <li> >+ <label for="partners" class="required">Select partner libraries:</label> >+ <select size="5" multiple="true" id="partners" name="partners" required="required"> >+ [% FOREACH partner IN whole.value.partners %] >+ [% IF partner.email && partner.email.length > 0 %] >+ <option data-partner-id="[% partner.id | html %]" value="[% partner.borrowernumber | html %]"> [% partner.branchcode _ " - " _ partner.surname %] </option> >+ [% END %] > [% END %] > </select> >+ [% IF Koha.Preference('ILLCheckAvailability') %] >+ <div id="generic_confirm_search_count">Partners available for searching: <span id="generic_confirm_enabled">none</span></div> >+ <div id="generic_confirm_search"> >+ <button type="button">Search selected partners</button> >+ </div> >+ [% END %] > </li> >- [% IF batches.count > 0 %] >- <li class="batch"> >- <label class="batch_label">Batch:</label> >- <select id="batch_id" name="batch_id"> >- <option value=""> >- [% FOREACH batch IN batches %] >- <option value="[% batch.id | html %]" [% IF batch.id == request.batch_id %]selected[% END %]> [% batch.name | html %] </option> >- [% END %] >- </option></select >- > >- </li> >- [% END %] >- <li class="updated"> >- <label class="updated">Last updated:</label> >- [% request.updated | $KohaDates with_hours => 1 %] >- </li> >- <li class="medium"> >- <label class="medium">Request type:</label> >- [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %] >- </li> >- <li class="cost"> >- <label class="cost">Cost:</label> >- [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %] >- </li> >- <li class="price_paid"> >- <label class="price_paid">Price paid:</label> >- <input name="price_paid" id="price_paid" type="text" value="[% request.price_paid | html %]" /> >- </li> >- <li class="req_id"> >- <label class="req_id">Request ID:</label> >- [% request.id_prefix _ request.illrequest_id | html %] >- </li> >- <li class="notesstaff"> >- <label for="notesstaff" class="notesstaff">Staff notes:</label> >- <textarea name="notesstaff" id="notesstaff" rows="5">[% request.notesstaff | html %]</textarea> >+ <li> >+ <label for="subject" class="required">Subject line:</label> >+ <input type="text" name="subject" id="subject" type="text" value="[% whole.value.draft.subject | html %]" required="required" /> > </li> >- <li class="notesopac"> >- <label for="notesopac" class="notesopac">OPAC notes:</label> >- <textarea name="notesopac" id="notesopac" rows="5">[% request.notesopac | html %]</textarea> >+ <li> >+ <label for="body" class="required">Email text:</label> >+ <textarea name="body" id="body" rows="20" cols="80" required="required">[% whole.value.draft.body | html %]</textarea> > </li> >- [% IF stat == 'UNAUTH' %] >- <h4>Unauthenticated request details</h4> >- [% INCLUDE unauthenticated_details %] >- [% END %] > </ol> >+ <input type="hidden" value="cud-generic_confirm" name="op" /> >+ <input type="hidden" value="draft" name="stage" /> >+ <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> > </fieldset> > <fieldset class="action"> >- <input type="hidden" value="cud-edit_action" name="op" /> >- <input type="hidden" value="form" name="stage" /> >- <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> >- <input type="submit" class="btn btn-primary" value="Submit" /> >- <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Cancel</a> >+ <input type="submit" class="btn btn-primary" value="Send email" /> >+ <span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span> > </fieldset> > </form> >- [% ELSIF op == 'delete_confirm' %] >- <div class="alert alert-warning"> >- <h3>Are you sure you wish to delete this request?</h3> >- <form action="/cgi-bin/koha/ill/ill-requests.pl" method="post"> >- [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="op" value="cud-delete" /> >- <input type="hidden" name="confirmed" value="1" /> >- <input type="hidden" name="illrequest_id" value="[% request.id | html %]" /> >- <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button> >- </form> >- <a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-times"></i>No, do not delete</a> >- </div> >- [% ELSIF op == 'illview' %] >- [% IF whole.template.length > 0 %] >- [% PROCESS $whole.template %] >+ [% IF Koha.Preference('ILLCheckAvailability') %] >+ <div id="partnerSearch" class="modal" tabindex="-1" role="dialog" aria-labelledby="partnerSearchLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <h1 class="modal-title" id="partnerSearchLabel"> Search partners</h1> >+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> >+ </div> >+ <div class="modal-body"> >+ [% FOR service IN services %] >+ <h4 class="ill_availability_sourcename">[% service.name | html %]</h4> >+ [% INCLUDE 'ill-availability-table.inc' service=service %] >+ [% END %] >+ <span id="service_id_restrict" data-service_id_restrict_plugin="ILL availability - z39.50" data-service_id_restrict_ids=""></span> >+ </div> >+ <div class="modal-footer"> >+ <button class="btn btn-default" data-bs-dismiss="modal">Close</button> >+ </div> >+ </div> >+ </div> >+ </div> > [% END %] >- [% req_status = request.status %] >+ [% ELSE %] >+ <fieldset class="rows"> >+ <legend>Interlibrary loan request details</legend> >+ <p>No partners have been defined yet. Please create appropriate patron records (by default IL category).</p> >+ <p>Be sure to provide email addresses for these patrons.</p> >+ <p >+ ><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p >+ > >+ </fieldset> >+ [% END %] >+ <!-- generic_confirm ends here --> >+ [% ELSIF op == 'edit_action' %] >+ <form method="POST" id="ill_edit_action_form" action="/cgi-bin/koha/ill/ill-requests.pl"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <fieldset class="rows"> >+ <legend>Request details</legend> >+ <ol> >+ [% type = request.get_type %] >+ <li class="borrowernumber"> >+ <label for="borrowernumber">Patron ID:</label> >+ <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" /> >+ </li> >+ [%# prettier-ignore-start %] >+ [% PROCESS select_manager_form manager => request.manager required_permission => CAN_user_ill %] >+ [%# prettier-ignore-end %] >+ <li class="biblio_id"> >+ <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label> >+ <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" /> >+ </li> >+ <li class="branchcode"> >+ <label for="library" class="branchcode">Library:</label> >+ <select name="branchcode" id="library"> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => request.branchcode ) %] >+ </select> >+ </li> >+ <li class="status"> >+ <label class="status">Status:</label> >+ [% stat = request.status %] >+ [% current_alias = request.status_alias %] >+ <select id="status_alias" name="status_alias"> >+ <option value="" [% UNLESS current_alias %]selected[% END %]> [% request.capabilities.$stat.name | html %] </option> >+ [% FOREACH alias IN AuthorisedValues.Get('ILL_STATUS_ALIAS') %] >+ <option value="[% alias.authorised_value | html %]" [% IF alias.authorised_value == current_alias %]selected[% END %]> [% alias.lib | html %] </option> >+ [% END %] >+ </select> >+ </li> >+ [% IF batches.count > 0 %] >+ <li class="batch"> >+ <label class="batch_label">Batch:</label> >+ <select id="batch_id" name="batch_id"> >+ <option value=""> >+ [% FOREACH batch IN batches %] >+ <option value="[% batch.id | html %]" [% IF batch.id == request.batch_id %]selected[% END %]> [% batch.name | html %] </option> >+ [% END %] >+ </option></select >+ > >+ </li> >+ [% END %] >+ <li class="updated"> >+ <label class="updated">Last updated:</label> >+ [% request.updated | $KohaDates with_hours => 1 %] >+ </li> >+ <li class="medium"> >+ <label class="medium">Request type:</label> >+ [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %] >+ </li> >+ <li class="cost"> >+ <label class="cost">Cost:</label> >+ [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %] >+ </li> >+ <li class="price_paid"> >+ <label class="price_paid">Price paid:</label> >+ <input name="price_paid" id="price_paid" type="text" value="[% request.price_paid | html %]" /> >+ </li> >+ <li class="req_id"> >+ <label class="req_id">Request ID:</label> >+ [% request.id_prefix _ request.illrequest_id | html %] >+ </li> >+ <li class="notesstaff"> >+ <label for="notesstaff" class="notesstaff">Staff notes:</label> >+ <textarea name="notesstaff" id="notesstaff" rows="5">[% request.notesstaff | html %]</textarea> >+ </li> >+ <li class="notesopac"> >+ <label for="notesopac" class="notesopac">OPAC notes:</label> >+ <textarea name="notesopac" id="notesopac" rows="5">[% request.notesopac | html %]</textarea> >+ </li> >+ [% IF stat == 'UNAUTH' %] >+ <h4>Unauthenticated request details</h4> >+ [% INCLUDE unauthenticated_details %] >+ [% END %] >+ </ol> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="hidden" value="cud-edit_action" name="op" /> >+ <input type="hidden" value="form" name="stage" /> >+ <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id" /> >+ <input type="submit" class="btn btn-primary" value="Submit" /> >+ <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]">Cancel</a> >+ </fieldset> >+ </form> >+ [% ELSIF op == 'delete_confirm' %] >+ <div class="alert alert-warning"> >+ <h3>Are you sure you wish to delete this request?</h3> >+ <form action="/cgi-bin/koha/ill/ill-requests.pl" method="post"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="op" value="cud-delete" /> >+ <input type="hidden" name="confirmed" value="1" /> >+ <input type="hidden" name="illrequest_id" value="[% request.id | html %]" /> >+ <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button> >+ </form> >+ <a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-times"></i>No, do not delete</a> >+ </div> >+ [% ELSIF op == 'illview' %] >+ [% IF whole.template.length > 0 %] >+ [% PROCESS $whole.template %] >+ [% END %] >+ [% req_status = request.status %] > >- [% IF error %] >- [% IF error == 'migrate_target' %] >- <div class="alert alert-warning"> The backend you tried to migrate to does not yet support migrations, please try again with an alternative target. </div> >- [% END %] >+ [% IF error %] >+ [% IF error == 'migrate_target' %] >+ <div class="alert alert-warning"> The backend you tried to migrate to does not yet support migrations, please try again with an alternative target. </div> > [% END %] >+ [% END %] > >- [% IF tran_success %] >- [% succ_methods = [] %] >- [% IF tran_success.match('email') %] >- [% succ_methods.push('email') %] >- [% END %] >- [% IF tran_success.match('sms') %] >- [% succ_methods.push('SMS') %] >- [% END %] >- <div class="alert alert-warning"> The requested notice was queued for delivery by [% succ_methods.join(', ') | html %] </div> >+ [% IF tran_success %] >+ [% succ_methods = [] %] >+ [% IF tran_success.match('email') %] >+ [% succ_methods.push('email') %] > [% END %] >- [% IF tran_fail %] >- [% fail_methods = [] %] >- [% IF tran_fail.match('email') %] >- [% fail_methods.push('email') %] >- [% END %] >- [% IF tran_fail.match('sms') %] >- [% fail_methods.push('SMS') %] >- [% END %] >- <div class="alert alert-warning"> The requested notice was NOT queued for delivery by [% fail_methods.join(', ') | html %] </div> >+ [% IF tran_success.match('sms') %] >+ [% succ_methods.push('SMS') %] > [% END %] >+ <div class="alert alert-warning"> The requested notice was queued for delivery by [% succ_methods.join(', ') | html %] </div> >+ [% END %] >+ [% IF tran_fail %] >+ [% fail_methods = [] %] >+ [% IF tran_fail.match('email') %] >+ [% fail_methods.push('email') %] >+ [% END %] >+ [% IF tran_fail.match('sms') %] >+ [% fail_methods.push('SMS') %] >+ [% END %] >+ <div class="alert alert-warning"> The requested notice was NOT queued for delivery by [% fail_methods.join(', ') | html %] </div> >+ [% END %] > >- <h1>Manage ILL request [% request.id_prefix _ request.illrequest_id | html %]</h1> >- <div id="request-toolbar" class="btn-toolbar"> >- [% FOREACH action IN request.available_actions %] >- [% needs_prefs = action.needs_prefs.size ? action.needs_prefs : [] %] >- [% needs_perms = action.needs_perms.size ? action.needs_perms : [] %] >- [% needs_all = action.needs_all.size ? action.needs_all : [] %] >- [% has_prefs_count = 0 %] >- [% has_perms_count = 0 %] >- [% has_all_count = 0 %] >- [% FOREACH pref IN needs_prefs %] >- [% IF Koha.Preference(pref) %] >- [% has_prefs_count = has_prefs_count + 1 %] >- [% END %] >+ <h1>Manage ILL request [% request.id_prefix _ request.illrequest_id | html %]</h1> >+ <div id="request-toolbar" class="btn-toolbar"> >+ [% FOREACH action IN request.available_actions %] >+ [% needs_prefs = action.needs_prefs.size ? action.needs_prefs : [] %] >+ [% needs_perms = action.needs_perms.size ? action.needs_perms : [] %] >+ [% needs_all = action.needs_all.size ? action.needs_all : [] %] >+ [% has_prefs_count = 0 %] >+ [% has_perms_count = 0 %] >+ [% has_all_count = 0 %] >+ [% FOREACH pref IN needs_prefs %] >+ [% IF Koha.Preference(pref) %] >+ [% has_prefs_count = has_prefs_count + 1 %] > [% END %] >- [% FOREACH perm IN needs_perms %] >- [% perm_name = 'CAN_' _ perm %] >- [% IF ($perm_name) %] >- [% has_perms_count = has_perms_count + 1 %] >- [% END %] >+ [% END %] >+ [% FOREACH perm IN needs_perms %] >+ [% perm_name = 'CAN_' _ perm %] >+ [% IF ($perm_name) %] >+ [% has_perms_count = has_perms_count + 1 %] > [% END %] >- [% FOREACH func IN needs_all %] >- [% IF func(request) %] >- [% has_all_count = has_all_count + 1 %] >- [% END %] >+ [% END %] >+ [% FOREACH func IN needs_all %] >+ [% IF func(request) %] >+ [% has_all_count = has_all_count + 1 %] > [% END %] >- [% NEXT IF has_prefs_count < needs_prefs.size || has_perms_count < needs_perms.size || has_all_count < needs_all.size %] >- [% IF action.method == 'migrate' %] >- [% IF Koha.Preference('AutoILLBackendPriority') && backends.size > 1 %] >- <a >- title="[% action.ui_method_name | html %]" >- id="ill-toolbar-btn-[% action.id | lower | html %]" >- class="btn btn-default" >- href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&auto_migrate=1" >- > >- <span class="fa [% action.ui_method_icon | html %]"></span> >- [% action.ui_method_name | html %] >- </a> >- [% ELSIF backends.size > 2 %] >- <div class="dropdown btn-group"> >- <button class="btn btn-default dropdown-toggle" type="button" id="ill-migrate-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >- <i class="fa [% action.ui_method_icon | html %]"></i> [% action.ui_method_name | html %] >- </button> >- <ul class="dropdown-menu" aria-labelledby="ill-migrate-dropdown"> >- [% FOREACH backend IN backends %] >- [% IF backend != request.backend %] >- <li >- ><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&backend=[% backend | uri %]" >- >[% backend | html %]</a >- ></li >- > >- [% END %] >- [% END %] >- </ul> >- </div> >- [% ELSIF backends.size == 2 %] >- [% FOREACH backend IN backends %] >- [% IF backend != request.backend %] >- <a >- title="[% action.ui_method_name | html %]" >- id="ill-toolbar-btn-[% action.id | lower | html %]" >- class="btn btn-default" >- href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&backend=[% backend | uri %]" >- > >- <span class="fa [% action.ui_method_icon | html %]"></span> >- [% action.ui_method_name | html %] >- </a> >- [% END %] >- [% END %] >- [% END %] >- [% ELSIF action.method != 0 %] >+ [% END %] >+ [% NEXT IF has_prefs_count < needs_prefs.size || has_perms_count < needs_perms.size || has_all_count < needs_all.size %] >+ [% IF action.method == 'migrate' %] >+ [% IF Koha.Preference('AutoILLBackendPriority') && backends.size > 1 %] > <a > title="[% action.ui_method_name | html %]" > id="ill-toolbar-btn-[% action.id | lower | html %]" >- [% IF action.id == 'REQ' %] >- class="btn btn-primary" >- [% ELSE %] >- class="btn btn-default" >- [% END %] >- href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]" >+ class="btn btn-default" >+ href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&auto_migrate=1" > > > <span class="fa [% action.ui_method_icon | html %]"></span> > [% action.ui_method_name | html %] > </a> >- [% END %] >- [% END %] >- <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?op=edit_action&illrequest_id=[% request.illrequest_id | html %]"> >- <i class="fa-solid fa-pencil" aria-hidden="true"></i> >- Edit request >- </a> >- [% IF request.borrowernumber %] >- <div class="dropdown btn-group"> >- <button class="btn btn-default dropdown-toggle" type="button" id="ill-notice-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >- <i class="fa-solid fa-envelope"></i> Send notice to patron >- </button> >- <ul class="dropdown-menu" aria-labelledby="ill-notice-dropdown"> >- [% FOREACH notice IN notices %] >- <li >- ><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl?op=send_notice&illrequest_id=[% request.illrequest_id | uri %]&notice_code=[% notice.code | uri %]" >- >[% notice.name | html %]</a >- ></li >+ [% ELSIF backends.size > 2 %] >+ <div class="dropdown btn-group"> >+ <button class="btn btn-default dropdown-toggle" type="button" id="ill-migrate-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >+ <i class="fa [% action.ui_method_icon | html %]"></i> [% action.ui_method_name | html %] >+ </button> >+ <ul class="dropdown-menu" aria-labelledby="ill-migrate-dropdown"> >+ [% FOREACH backend IN backends %] >+ [% IF backend != request.backend %] >+ <li >+ ><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&backend=[% backend | uri %]" >+ >[% backend | html %]</a >+ ></li >+ > >+ [% END %] >+ [% END %] >+ </ul> >+ </div> >+ [% ELSIF backends.size == 2 %] >+ [% FOREACH backend IN backends %] >+ [% IF backend != request.backend %] >+ <a >+ title="[% action.ui_method_name | html %]" >+ id="ill-toolbar-btn-[% action.id | lower | html %]" >+ class="btn btn-default" >+ href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]&backend=[% backend | uri %]" > > >+ <span class="fa [% action.ui_method_icon | html %]"></span> >+ [% action.ui_method_name | html %] >+ </a> > [% END %] >- </ul> >- </div> >- [% END %] >- <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default" href="#"> >- <span class="fa-solid fa-eye"></span> >- Display supplier metadata >- </a> >- <a title="ILL request log" id="ill-request-display-log" class="btn btn-default" href="#"> >- <span class="fa-solid fa-calendar-days"></span> >- ILL request log >- </a> >- </div> >- <div class="page-section"> >- <h3>Request details</h3> >- <h4>Details from library</h4> >- [% IF request.get_copyright_clearance_confirmed %] >- <h5> <i class="fa fa-fw fa-check text-success" aria-hidden="true"></i> <span class="tab-title">Patron has confirmed copyright clearance for this request</span> </h5> >- [% END %] >- <div class="rows"> >- <ol> >- [% IF request.orderid %] >- <li class="orderid"> >- <span class="label orderid">Order ID:</span> >- [% request.orderid | html %] >- </li> > [% END %] >- [% IF request.borrowernumber %] >- <li class="borrowernumber"> >- <span class="label borrowernumber">Patron:</span> >- [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] >- <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a> >- </li> >+ [% END %] >+ [% ELSIF action.method != 0 %] >+ <a >+ title="[% action.ui_method_name | html %]" >+ id="ill-toolbar-btn-[% action.id | lower | html %]" >+ [% IF action.id == 'REQ' %] >+ class="btn btn-primary" >+ [% ELSE %] >+ class="btn btn-default" >+ [% END %] >+ href="/cgi-bin/koha/ill/ill-requests.pl?op=[% action.method | uri %]&illrequest_id=[% request.illrequest_id | uri %]" >+ > >+ <span class="fa [% action.ui_method_icon | html %]"></span> >+ [% action.ui_method_name | html %] >+ </a> >+ [% END %] >+ [% END %] >+ <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?op=edit_action&illrequest_id=[% request.illrequest_id | html %]"> >+ <i class="fa-solid fa-pencil" aria-hidden="true"></i> >+ Edit request >+ </a> >+ [% IF request.borrowernumber %] >+ <div class="dropdown btn-group"> >+ <button class="btn btn-default dropdown-toggle" type="button" id="ill-notice-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >+ <i class="fa-solid fa-envelope"></i> Send notice to patron >+ </button> >+ <ul class="dropdown-menu" aria-labelledby="ill-notice-dropdown"> >+ [% FOREACH notice IN notices %] >+ <li >+ ><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl?op=send_notice&illrequest_id=[% request.illrequest_id | uri %]&notice_code=[% notice.code | uri %]" >+ >[% notice.name | html %]</a >+ ></li >+ > > [% END %] >- [% PROCESS select_manager_show >- manager => request.manager >- display => "fieldset" >- %] >+ </ul> >+ </div> >+ [% END %] >+ <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default" href="#"> >+ <span class="fa-solid fa-eye"></span> >+ Display supplier metadata >+ </a> >+ <a title="ILL request log" id="ill-request-display-log" class="btn btn-default" href="#"> >+ <span class="fa-solid fa-calendar-days"></span> >+ ILL request log >+ </a> >+ </div> >+ <div class="page-section"> >+ <h3>Request details</h3> >+ <h4>Details from library</h4> >+ [% IF request.get_copyright_clearance_confirmed %] >+ <h5> <i class="fa fa-fw fa-check text-success" aria-hidden="true"></i> <span class="tab-title">Patron has confirmed copyright clearance for this request</span> </h5> >+ [% END %] >+ <div class="rows"> >+ <ol> >+ [% IF request.orderid %] >+ <li class="orderid"> >+ <span class="label orderid">Order ID:</span> >+ [% request.orderid | html %] >+ </li> >+ [% END %] >+ [% IF request.borrowernumber %] >+ <li class="borrowernumber"> >+ <span class="label borrowernumber">Patron:</span> >+ [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] >+ <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a> >+ </li> >+ [% END %] >+ [%# prettier-ignore-start %] >+ [% PROCESS select_manager_show manager => request.manager display => "fieldset" %] >+ [%# prettier-ignore-start %] > [% IF request.biblio_id %] > <li class="biblio_id"> > <span class="label biblio_id">Bibliographic record ID:</span> >@@ -1130,92 +1127,94 @@ > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'select2.inc' %] > [% IF op == 'edit_action' %] >- [% INCLUDE 'select_manager.inc' >- add_modal => 1 >- manager => request.manager >- filter => 'ill_users' >- %] >- [% END %] >- [% IF metadata_enrichment_services %] >- <script> >- var ill_check_availability_syspref = '[% Koha.Preference('ILLCheckAvailability') | html %]'; >- var metadata_enrichment_services = [% metadata_enrichment_services | $raw %]; >- </script> >+ [%# prettier-ignore-start %] >+ [% INCLUDE 'select_manager.inc' add_modal => 1 manager => request.manager filter => 'ill_users' %] >+ [%# prettier-ignore-end %] >+ </ol></div >+ ></div >+ > >+ [% END %] >+ [% IF metadata_enrichment_services %] >+ <script> >+ var ill_check_availability_syspref = '[% Koha.Preference('ILLCheckAvailability') | html %]'; >+ var metadata_enrichment_services = [% metadata_enrichment_services | $raw %]; >+ </script> >+ <script> >+ [% IF batch_availability_services %] >+ var batch_availability_services = [% batch_availability_services | $raw %]; >+ [% ELSE %] >+ var batch_availability_services = []; >+ [% END %] >+ </script> >+ [% END %] > <script> >- [% IF batch_availability_services %] >- var batch_availability_services = [% batch_availability_services | $raw %]; >+ var prefilters = '[% prefilters | $raw %]'; >+ // Set column settings >+ var table_settings = [% TablesSettings.GetTableSettings( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) | $raw %]; >+ >+ [% IF services_json.length > 0 %] >+ var services = [% services_json | $raw %]; >+ [% ELSE %] >+ var services = []; >+ [% END %] >+ [% IF auto_backends_json.length > 0 %] >+ var auto_backends = [% auto_backends_json | $raw %]; > [% ELSE %] >- var batch_availability_services = []; >+ var auto_backends = []; >+ [% END %] >+ [% IF metadata.length > 0 %] >+ var metadata = "[% metadata | $raw %]"; > [% END %] > </script> >- [% END %] >- <script> >- var prefilters = '[% prefilters | $raw %]'; >- // Set column settings >- var table_settings = [% TablesSettings.GetTableSettings( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) | $raw %]; >+ <script> >+ $("#ill_checkout_inhouse_select").on("change", function () { >+ if ($(this).val().length > 0) { >+ $(".ill_checkout_due_date").hide(); >+ } else { >+ $(".ill_checkout_due_date").show(); >+ } >+ }); > >- [% IF services_json.length > 0 %] >- var services = [% services_json | $raw %]; >- [% ELSE %] >- var services = []; >+ if ($("#ill_edit_action_form #borrowernumber").length) { >+ patron_autocomplete($("#ill_edit_action_form #borrowernumber"), { >+ "on-select-callback": function (event, ui) { >+ $("#ill_edit_action_form #borrowernumber").val(ui.item.patron_id); >+ return false; >+ }, >+ }); >+ } >+ </script> >+ [% INCLUDE 'ill-list-table-strings.inc' %] >+ [% INCLUDE 'ill-batch-table-strings.inc' %] >+ [% INCLUDE 'ill-batch-modal-strings.inc' %] >+ [% Asset.js("js/ill-list-table.js") | $raw %] >+ [% Asset.js("js/ill-batch.js") | $raw %] >+ [% Asset.js("js/ill-batch-table.js") | $raw %] >+ [% Asset.js("js/ill-batch-modal.js") | $raw %] >+ [% IF (op == 'availability' || op == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %] >+ [% Asset.js("js/ill-availability.js") | $raw %] > [% END %] >- [% IF auto_backends_json.length > 0 %] >- var auto_backends = [% auto_backends_json | $raw %]; >- [% ELSE %] >- var auto_backends = []; >+ [% IF (op == 'confirmautoill' && Koha.Preference('AutoILLBackendPriority')) %] >+ [% Asset.js("js/ill-autobackend.js") | $raw %] > [% END %] >- [% IF metadata.length > 0 %] >- var metadata = "[% metadata | $raw %]"; >+ [% IF op == 'availability' && Koha.Preference('ILLCheckAvailability') %] >+ <script> >+ $(document).ready(function () { >+ window.doSearch(); >+ }); >+ </script> > [% END %] >- </script> >- <script> >- $("#ill_checkout_inhouse_select").on("change", function () { >- if ($(this).val().length > 0) { >- $(".ill_checkout_due_date").hide(); >- } else { >- $(".ill_checkout_due_date").show(); >- } >- }); >- >- if ($("#ill_edit_action_form #borrowernumber").length) { >- patron_autocomplete($("#ill_edit_action_form #borrowernumber"), { >- "on-select-callback": function (event, ui) { >- $("#ill_edit_action_form #borrowernumber").val(ui.item.patron_id); >- return false; >- }, >- }); >- } >- </script> >- [% INCLUDE 'ill-list-table-strings.inc' %] >- [% INCLUDE 'ill-batch-table-strings.inc' %] >- [% INCLUDE 'ill-batch-modal-strings.inc' %] >- [% Asset.js("js/ill-list-table.js") | $raw %] >- [% Asset.js("js/ill-batch.js") | $raw %] >- [% Asset.js("js/ill-batch-table.js") | $raw %] >- [% Asset.js("js/ill-batch-modal.js") | $raw %] >- [% IF (op == 'availability' || op == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %] >- [% Asset.js("js/ill-availability.js") | $raw %] >- [% END %] >- [% IF (op == 'confirmautoill' && Koha.Preference('AutoILLBackendPriority')) %] >- [% Asset.js("js/ill-autobackend.js") | $raw %] >- [% END %] >- [% IF op == 'availability' && Koha.Preference('ILLCheckAvailability') %] >- <script> >- $(document).ready(function () { >- window.doSearch(); >- }); >- </script> >- [% END %] >- [% IF op == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %] >- [% Asset.js("js/ill-availability-partner.js") | $raw %] >+ [% IF op == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %] >+ [% Asset.js("js/ill-availability-partner.js") | $raw %] >+ [% END %] >+ [% Asset.js("lib/jquery/plugins/multiple-select/multiple-select.min.js") | $raw %] > [% END %] >- [% Asset.js("lib/jquery/plugins/multiple-select/multiple-select.min.js") | $raw %] >-[% END %] >-<!-- prettier-ignore-start --> >+ <!-- prettier-ignore-start --> > [% TRY %] > [% PROCESS backend_jsinclude %] > [% CATCH %] > [% END %] > <!-- prettier-ignore-end --> > >-[% INCLUDE 'intranet-bottom.inc' %] >+ [% INCLUDE 'intranet-bottom.inc' %] >+</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index fef5e125b42..4f4a22e2cd6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -258,11 +258,9 @@ > [% END %] > </td> > </tr> >- [% >- PROCESS select_manager_show >- manager => suggestion.manager >- display => "table" >- %] >+ [%# prettier-ignore-start %] >+ [% PROCESS select_manager_show manager => suggestion.manager display => "table" %] >+ [%# prettier-ignore-end %] > <tr> > <th>Accepted on:</th> > <td>[% suggestion.accepteddate | $KohaDates %]</td> >@@ -596,12 +594,7 @@ > <label for="managedon">Managed on:</label> > <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% default_manageddate | html %]" />[% INCLUDE 'date-format.inc' %] > </li> >- [% >- PROCESS select_manager_form >- manager => suggestion.manager >- notify_option => 1 >- required_permission => CAN_user_suggestions_suggestions_manage >- %] >+ [% PROCESS select_manager_form manager => suggestion.manager notify_option => 1 required_permission => CAN_user_suggestions_suggestions_manage %] > </ol> > </fieldset> > >@@ -881,13 +874,9 @@ > [% hash_href_val = "patron_search_modal_manager_" _ suggestion.suggestiontype %] > [% id_val = "set_manager_" _ suggestion.suggestiontype %] > [% data_tab_val = suggestion.suggestiontype %] >- >- [% >- PROCESS select_manager_button >- href = hash_href_val >- id = id_val >- data_tab = data_tab_val >- %] >+ [%# prettier-ignore-start %] >+ [% PROCESS select_manager_button href = hash_href_val id = id_val data_tab = data_tab_val %] >+ [%# prettier-ignore-end %] > <span id="managedby_name-[% suggestion.suggestiontype | html %]"></span> > </fieldset> > <fieldset class="action"> >@@ -1217,10 +1206,9 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- [% >- INCLUDE 'select_manager.inc' >- manager => suggestion.manager >- %] >+ [%# prettier-ignore-start %] >+ [% INCLUDE 'select_manager.inc' manager => suggestion.manager %] >+ [%# prettier-ignore-end %] > <script> > function select_suggester(borrowernumber, borrower) { > $.ajax({ >-- >2.39.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 40504
:
187906
|
187907
|
187908
|
187909
|
187910
|
187911
|
187912
|
187913
|
187914
|
187915
|
188365
|
188563
|
188565
|
188566
|
188567
|
188568
|
188569
|
188570
|
188571
|
188572
|
188573
|
188574
|
188624
|
188625
|
188935
|
188936
|
191196
|
191197
|
191198
|
191199
|
191200
|
191201
|
191202
|
191203
|
191204
|
191205
|
191206
|
192094
|
193186
|
193187
|
193188
|
193189
|
193190
|
193191
|
193192
|
193193
|
193194
|
193195
|
193196
|
193197
|
194023
|
194024
|
194026
|
194027
|
194028
|
194029
|
194030
|
194031
|
194032
|
194033
|
194034
|
194035
|
194036
|
194037
| 194038