Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34478: ILL INTRA: query_type => op

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Pedro Amorim 2024-02-06 10:05:19 +00:00 committed by Jonathan Druart
parent 38b21ff3b8
commit a9adee54b8
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ill/ill-requests.pl
View file

@ -460,10 +460,10 @@ if ( $backends_available ) {
} }
$template->param( $template->param(
backends => $backends, backends => $backends,
types => [ "Book", "Article", "Journal" ], types => [ "Book", "Article", "Journal" ],
query_type => $op, op => $op,
branches => Koha::Libraries->search, branches => Koha::Libraries->search,
); );
output_html_with_http_headers( $cgi, $cookie, $template->output ); output_html_with_http_headers( $cgi, $cookie, $template->output );

38
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
View file

@ -23,21 +23,21 @@
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
[% WRAPPER breadcrumbs %] [% WRAPPER breadcrumbs %]
[% IF query_type == 'cud-create' %] [% IF op == 'cud-create' %]
[% WRAPPER breadcrumb_item %] [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a> <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
[% END %] [% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %] [% WRAPPER breadcrumb_item bc_active= 1 %]
<span>New request</span> <span>New request</span>
[% END %] [% END %]
[% ELSIF query_type == 'illview' %] [% ELSIF op == 'illview' %]
[% WRAPPER breadcrumb_item %] [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a> <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
[% END %] [% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %] [% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Manage request [% request.id_prefix _ request.illrequest_id | html %]</span> <span>Manage request [% request.id_prefix _ request.illrequest_id | html %]</span>
[% END %] [% END %]
[% ELSIF query_type == 'typedisclaimer' %] [% ELSIF op == 'typedisclaimer' %]
[% WRAPPER breadcrumb_item %] [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a> <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
[% END %] [% END %]
@ -55,7 +55,7 @@
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">
[% IF query_type == 'illlist' %] [% IF op == 'illlist' %]
<div class="col-sm-2"> <div class="col-sm-2">
<aside> <aside>
<form method="get" id="illfilter_form"> <form method="get" id="illfilter_form">
@ -141,19 +141,19 @@
<p>[% whole.success | html %]</p> <p>[% whole.success | html %]</p>
[% END %] [% END %]
[% IF query_type == 'cud-create' %] [% IF op == 'cud-create' %]
<h1>New ILL request</h1> <h1>New ILL request</h1>
[% PROCESS $whole.template %] [% PROCESS $whole.template %]
[% ELSIF query_type == 'confirm' %] [% ELSIF op == 'confirm' %]
<h1>Confirm ILL request</h1> <h1>Confirm ILL request</h1>
[% PROCESS $whole.template %] [% PROCESS $whole.template %]
[% ELSIF query_type == 'cud-cancel' and !whole.error %] [% ELSIF op == 'cud-cancel' and !whole.error %]
<h1>Cancel a confirmed request</h1> <h1>Cancel a confirmed request</h1>
[% PROCESS $whole.template %] [% PROCESS $whole.template %]
[% ELSIF query_type == 'check_out' and !whole.error %] [% ELSIF op == 'check_out' and !whole.error %]
[% IF !whole.stage || whole.stage == 'form' %] [% IF !whole.stage || whole.stage == 'form' %]
<h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1> <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 %] [% IF !request.biblio_id || request.biblio_id.length == 0 %]
@ -300,7 +300,7 @@
</fieldset> </fieldset>
[% END %] [% END %]
[% ELSIF query_type == 'generic_confirm' %] [% ELSIF op == 'generic_confirm' %]
<h1>Place request with partner libraries</h1> <h1>Place request with partner libraries</h1>
[% IF error %] [% IF error %]
[% IF error == 'no_target_email' %] [% IF error == 'no_target_email' %]
@ -399,7 +399,7 @@
[% END %] [% END %]
<!-- generic_confirm ends here --> <!-- generic_confirm ends here -->
[% ELSIF query_type == 'edit_action' %] [% ELSIF op == 'edit_action' %]
<form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl"> <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">
[% INCLUDE 'csrf-token.inc' %] [% INCLUDE 'csrf-token.inc' %]
<fieldset class="rows"> <fieldset class="rows">
@ -499,7 +499,7 @@
</fieldset> </fieldset>
</form> </form>
[% ELSIF query_type == 'delete_confirm' %] [% ELSIF op == 'delete_confirm' %]
<div class="dialog alert"> <div class="dialog alert">
<h3>Are you sure you wish to delete this request?</h3> <h3>Are you sure you wish to delete this request?</h3>
@ -513,7 +513,7 @@
<a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-times"></i>No, do not delete</a> <a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?op=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-times"></i>No, do not delete</a>
</div> </div>
[% ELSIF query_type == 'illview' %] [% ELSIF op == 'illview' %]
[% IF whole.template.length > 0 %] [% IF whole.template.length > 0 %]
[% PROCESS $whole.template %] [% PROCESS $whole.template %]
[% END %] [% END %]
@ -809,7 +809,7 @@
</div> </div>
</div> </div>
[% ELSIF query_type == 'illlist' %] [% ELSIF op == 'illlist' %]
<!-- illlist --> <!-- illlist -->
<h1> <h1>
[% IF !batch %] [% IF !batch %]
@ -822,7 +822,7 @@
<h2>Details for all requests</h2> <h2>Details for all requests</h2>
[% INCLUDE 'ill-list-table.inc' %] [% INCLUDE 'ill-list-table.inc' %]
</div> <!-- /#results --> </div> <!-- /#results -->
[% ELSIF query_type == 'availability' %] [% ELSIF op == 'availability' %]
<!-- availability --> <!-- availability -->
<h1>Availability</h1> <h1>Availability</h1>
<div id="results" class="page-section"> <div id="results" class="page-section">
@ -857,7 +857,7 @@
[% INCLUDE 'ill-availability-table.inc' service=service %] [% INCLUDE 'ill-availability-table.inc' service=service %]
[% END %] [% END %]
</div> </div>
[% ELSIF query_type == 'typedisclaimer' %] [% ELSIF op == 'typedisclaimer' %]
<!-- typedisclaimer --> <!-- typedisclaimer -->
<h1>Request type disclaimer</h1> <h1>Request type disclaimer</h1>
<div id="results" class="page-section"> <div id="results" class="page-section">
@ -898,7 +898,7 @@
</fieldset> </fieldset>
</form> </form>
</div> </div>
[% ELSIF query_type == 'batch_list' || query_type == 'batch_create' %] [% ELSIF op == 'batch_list' || op == 'batch_create' %]
[% INCLUDE 'ill-batch.inc' %] [% INCLUDE 'ill-batch.inc' %]
[% ELSE %] [% ELSE %]
<!-- Custom Backend Action --> <!-- Custom Backend Action -->
@ -962,17 +962,17 @@
[% Asset.js("js/ill-batch.js") | $raw %] [% Asset.js("js/ill-batch.js") | $raw %]
[% Asset.js("js/ill-batch-table.js") | $raw %] [% Asset.js("js/ill-batch-table.js") | $raw %]
[% Asset.js("js/ill-batch-modal.js") | $raw %] [% Asset.js("js/ill-batch-modal.js") | $raw %]
[% IF (query_type == 'availability' || query_type == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %] [% IF (op == 'availability' || op == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %]
[% Asset.js("js/ill-availability.js") | $raw %] [% Asset.js("js/ill-availability.js") | $raw %]
[% END %] [% END %]
[% IF query_type == 'availability' && Koha.Preference('ILLCheckAvailability') %] [% IF op == 'availability' && Koha.Preference('ILLCheckAvailability') %]
<script> <script>
$(document).ready(function() { $(document).ready(function() {
window.doSearch(); window.doSearch();
}); });
</script> </script>
[% END %] [% END %]
[% IF query_type == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %] [% IF op == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %]
[% Asset.js("js/ill-availability-partner.js") | $raw %] [% Asset.js("js/ill-availability-partner.js") | $raw %]
[% END %] [% END %]