dcd1f5d48c
Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
265 lines
11 KiB
Text
265 lines
11 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE ColumnsSettings %]
|
|
[% USE AuthorisedValues %]
|
|
[%- USE Branches -%]
|
|
[%- USE ItemTypes -%]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Circulation › Holds to pull</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
</head>
|
|
|
|
<body id="circ_pendingreserves" class="circ">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'circ-search.inc' %]
|
|
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Holds to pull</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% FOR m IN messages %]
|
|
<div class="dialog [% m.type | html %]">
|
|
[% SWITCH m.code %]
|
|
[% CASE 'letter_enqueued' %]
|
|
<span>The notice has been correctly enqueued.</span>
|
|
[% CASE 'no_email_address' %]
|
|
<span>The patron does not have an email address defined.</span>
|
|
[% CASE 'no_template_notice' %]
|
|
<span>There is no notice template with a code 'CANCEL_HOLD_ON_LOST' defined in your system.</span>
|
|
[% CASE 'hold_cancelled' %]
|
|
<span>The hold has been correctly cancelled.</span>
|
|
[% CASE 'hold_placed_at_biblio_level' %]
|
|
<span>The hold has been placed on biblio level. It is not possible to determine the item to mark as lost.</span>
|
|
[% CASE %]
|
|
[% m.code | html %]
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
|
|
<h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
|
|
<h3>Reported on [% todaysdate | $KohaDates %]</h3>
|
|
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
|
|
<div class="searchresults">
|
|
[% IF ( reserveloop ) %]
|
|
<table id="holdst">
|
|
<thead>
|
|
<tr>
|
|
<th>Pull this many items</th>
|
|
<th>Items available</th>
|
|
<th>Patrons with holds</th>
|
|
<th>First patron</td>
|
|
<th class="anti-the">Title</th>
|
|
<th class="string-sort">Libraries</th>
|
|
<th>Available call numbers</th>
|
|
<th>Available copy numbers</th>
|
|
<th>Available enumeration</th>
|
|
<th class="string-sort">Available item types</th>
|
|
<th class="string-sort">Available locations</th>
|
|
<th class="title-string">Earliest hold date</th>
|
|
<th>Action</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH reserveloo IN reserveloop %]
|
|
<tr>
|
|
[% IF ( reserveloo.borrowernumber ) %]
|
|
<td><p><b>[% reserveloo.pullcount | html %]</b></p></td>
|
|
<td>[% reserveloo.count | html %]</td>
|
|
<td>[% reserveloo.rcount | html %]</td>
|
|
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | html %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td>
|
|
<td>
|
|
<p>
|
|
[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
|
|
[% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
|
|
[% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
|
|
</td>
|
|
[% ELSE %]
|
|
<td>"</td>
|
|
<td>"</td>
|
|
<td>"</td>
|
|
<td>"</td>
|
|
<td>"</td>
|
|
[% END %]
|
|
<td>
|
|
[% FOREACH holdingbranch IN reserveloo.holdingbranches %]
|
|
[% Branches.GetName ( holdingbranch ) | html %]
|
|
[% END %]
|
|
</td>
|
|
<td><p>[% reserveloo.itemcallnumber | html %]</p></td>
|
|
<td><p>[% reserveloo.copyno | html %]</p></td>
|
|
<td><p>[% reserveloo.enumchron | html %]</p></td>
|
|
<td>
|
|
[% FOREACH itemType IN reserveloo.itemTypes %]
|
|
[% ItemTypes.GetDescription( itemType ) | html %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% FOREACH loc IN reserveloo.locations %]
|
|
[% AuthorisedValues.GetByCode('LOC', loc) | html %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
<span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) | html %]</span>
|
|
</td>
|
|
<td>
|
|
<form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
|
|
<input type="hidden" name="op" value="cancel_reserve" />
|
|
<input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id | html %]" />
|
|
[% IF reserveloo.holdingbranch != reserveloo.homebranch %]
|
|
<input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.homebranch ) | html %]" />
|
|
[% ELSE %]
|
|
<input type="submit" value="Cancel hold" />
|
|
[% END %]
|
|
</form>
|
|
|
|
[% IF Koha.Preference('CanMarkHoldsToPullAsLost') != 'do_not_allow' %]
|
|
[% IF reserveloo.itemnumber %]
|
|
<form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
|
|
<input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id | html %]" />
|
|
[% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %]
|
|
<input type="hidden" name="op" value="mark_as_lost" />
|
|
<input type="submit" value="Mark item as lost" />
|
|
[% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %]
|
|
<input type="hidden" name="op" value="mark_as_lost_and_notify" />
|
|
<input type="submit" value="Mark lost and notify patron" />
|
|
[% END %]
|
|
</form>
|
|
[% ELSE %]
|
|
<span>Biblio level hold.</span>
|
|
[% END %]
|
|
[% END %]
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
<tr>
|
|
<td><input type="text" class="filter" data-column_num="0" placeholder="Pull this many items" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="1" placeholder="Items available" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="2" placeholder="Patron holds" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="3" placeholder="Patron name" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="4" placeholder="Title" style="width:95%"/></td>
|
|
<td id="homebranchfilter"></td>
|
|
<td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
|
|
<td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
|
|
<td id="itemtype-filter"></td>
|
|
<td id="locationfilter"></td>
|
|
<td></td>
|
|
<td></td>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
[% ELSE %]
|
|
<b>No items found.</b>
|
|
[% END %]
|
|
</div>
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
<div id="filters">
|
|
|
|
<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
|
|
<fieldset class="brief">
|
|
<h4>Refine results</h4>
|
|
<ol>
|
|
<li>
|
|
<label for="from">
|
|
Start date:
|
|
</label>
|
|
<input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="datepickerfrom" />
|
|
</li>
|
|
<li><label for="to">
|
|
End date:
|
|
</label>
|
|
<input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="datepickerto" />
|
|
</li>
|
|
</ol>
|
|
|
|
[% IF ( HoldsToPullEndDate ) %]
|
|
<p><i>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</i></p>
|
|
[% ELSE %]
|
|
<p><i>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</i></p>
|
|
[% END %]
|
|
|
|
<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
|
|
</fieldset>
|
|
</form>
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% INCLUDE 'columns_settings.inc' %]
|
|
<script type="text/javascript">
|
|
$(document).ready(function() {
|
|
var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json').raw %];
|
|
var holdst = KohaTable("holdst", {
|
|
"aoColumnDefs": [
|
|
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] },
|
|
{ "sType": "string", "aTargets": [ "string-sort" ] }
|
|
],
|
|
"sPaginationType": "full_numbers"
|
|
}, columns_settings);
|
|
holdst.fnAddFilters("filter");
|
|
[%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %]
|
|
function separateData ( ColumnData ){
|
|
var cD = ColumnData;
|
|
var new_array = new Array();
|
|
for ( j=0 ; j<cD.length ; j++ ) {
|
|
var split_array = cD[j].split(/\n/gi);
|
|
for ( k=0 ; k<split_array.length ; k++ ){
|
|
var str = $.trim(split_array[k].replace(/[\n\r]/g, ''));
|
|
if ($.inArray(str, new_array) == -1 && str.length > 0 ) {
|
|
new_array.push(str);
|
|
}
|
|
}
|
|
}
|
|
new_array.sort();
|
|
return new_array;
|
|
}
|
|
[%# add SeparateData function into createSelect function, so that it does the createSelect on clean data %]
|
|
function createSelect( data ) {
|
|
data = separateData(data);
|
|
var r='<select style="width:99%"><option value="">' + _("None") + '</option>', i, len=data.length;
|
|
for ( i=0 ; i<len ; i++ ) {
|
|
r += '<option value="'+data[i]+'">'+data[i]+'</option>';
|
|
}
|
|
return r+'</select>';
|
|
}
|
|
$("#homebranchfilter").each( function () {
|
|
$(this).html( createSelect( holdst.fnGetColumnData(5) ) );
|
|
$('select', this).change( function () {
|
|
var filter_value = $(this).val();
|
|
holdst.fnFilter( filter_value, 5, true );
|
|
});
|
|
});
|
|
$("#itemtype-filter").each( function () {
|
|
$(this).html( createSelect( holdst.fnGetColumnData(9) ) );
|
|
$('select', this).change( function () {
|
|
holdst.fnFilter( $(this).val(), 9 );
|
|
});
|
|
});
|
|
$("#locationfilter").each( function () {
|
|
$(this).html( createSelect( holdst.fnGetColumnData(10) ) );
|
|
$('select', this).change( function () {
|
|
holdst.fnFilter( $(this).val(), 10 );
|
|
});
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|