From 0d4fee2615798aab8bdcb985480e31ffa158e87c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Sep 2014 17:14:00 +0200 Subject: [PATCH] Bug 5342: (qa-followup) FIX some issues this patch: - reintroduces the ISSN column - fix a wording (already there before the main patch) - fix the tests if a serial was already in late Signed-off-by: Katrin Fischer Small change: Removed 2 tabs in claims.tt and fixed order of ISSN/Issue number column descriptions as they were switched. Note: The tags are currently not stripped out of the notice. Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt | 6 ++++-- t/db_dependent/Serials/Claims.t | 2 ++ 2 files changed, 6 insertions(+), 2 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 49b8448a60..4eb131a329 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -31,7 +31,7 @@ $("#claimst tr:visible :checkbox").attr('checked', $("#CheckAll").is(':checked')); }); - // Generates a dynamic link for exporting the selections data as CSV + // Generates a dynamic link for exporting the selections data as CSV $("#ExportSelected").click(function() { // We need to use "input[name=serialid]:checked" instead of "input:checked". Otherwise, the "check all" box will pass the value of "on" as a serialid, which produces a SQL error. var selected = $("input[name=serialid]:checked"); @@ -64,7 +64,7 @@ // Checks if the form can be sent (at least one checkbox must be checked) function checkForm() { if ($("input:checked").length == 0) { - alert(_("Please select at least one item.")); + alert(_("Please select at least one issue.")); return false; } } @@ -275,6 +275,7 @@ Vendor Library Title + ISSN Issue number Status Since @@ -294,6 +295,7 @@ [% missingissue.title |html %] + [% missingissue.issn %] [% missingissue.serialseq %] [% IF ( missingissue.status1 ) %]Expected[% END %] diff --git a/t/db_dependent/Serials/Claims.t b/t/db_dependent/Serials/Claims.t index a90563dd45..60f851adcd 100644 --- a/t/db_dependent/Serials/Claims.t +++ b/t/db_dependent/Serials/Claims.t @@ -11,6 +11,8 @@ my $dbh = C4::Context->dbh; $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; +$dbh->do(q|DELETE FROM issues|); + my $branchcode = 'CPL'; my $bpid = AddBudgetPeriod({ budget_period_startdate => '2015-01-01', -- 2.39.5