From cc28d3cc6b5a0bdfe24bb6a35a0919595f593657 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Fri, 7 Jun 2013 12:14:02 +0200 Subject: [PATCH] [PASSED QA] Bug 10430 - status filter not working in serial claims when translated With a translated intranet (ie fr-FR) the status filter does not work for "Late" status. It is because status in combobox filter is translated "Retard" and status in table is translated "En retard". This patch changed javascript filter to work on a status code instead of status name. The new classes may be used to change CSS depending on status. Test plan : - Use a translated intranet (ie fr-FR) - Go to serials claim of a vendor with issues of multiple status - Check that status filter does its work Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Patch passes all tests and QA script. The status filter should probably be changed to only allow filtering on status that can appear on the page. --- .../prog/en/modules/serials/claims.tt | 50 +++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index 7528e9a..01af0e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -68,16 +68,20 @@ } } - // Filter by status - function filterByStatus() { - selectedStatus = $("#statusfilter").val(); - if (selectedStatus == "all") { - clearFilters(); - } else { - $("table#claimst tbody tr").hide(); - $("table#claimst tbody tr:contains(" + selectedStatus + ")").show(); - } - } + // Filter by status + function filterByStatus() { + selectedStatus = $("#statusfilter").val(); + if (selectedStatus == "all") { + clearFilters(); + } else { + $("table#claimst tbody tr").hide(); + $("table#claimst tbody tr").each( function() { + if ( $(this).find("span.status-" + selectedStatus).size() > 0 ) { + $(this).show(); + } + }); + } + } // Filter by branch function filterByBranch() { @@ -201,13 +205,13 @@
  • @@ -281,12 +285,12 @@ [% missingissue.serialseq %] - [% IF ( missingissue.status1 ) %]Expected[% END %] - [% IF ( missingissue.status2 ) %]Arrived[% END %] - [% IF ( missingissue.status3 ) %]Late[% END %] - [% IF ( missingissue.status4 ) %]Missing[% END %] - [% IF ( missingissue.status7 ) %]Claimed[% END %] - [% IF ( missingissue.status8 ) %]Stopped[% END %] + [% IF ( missingissue.status1 ) %]Expected[% END %] + [% IF ( missingissue.status2 ) %]Arrived[% END %] + [% IF ( missingissue.status3 ) %]Late[% END %] + [% IF ( missingissue.status4 ) %]Missing[% END %] + [% IF ( missingissue.status7 ) %]Claimed[% END %] + [% IF ( missingissue.status8 ) %]Stopped[% END %] [% missingissue.planneddate %] -- 1.7.9.5