Attachment 32172 Details for Bug 5342 – [PASSED QA] Bug 5342: (qa-followup) FIX some issues

[patch] [PASSED QA] Bug 5342: (qa-followup) FIX some issues

PASSED-QA-Bug-5342-qa-followup-FIX-some-issues.patch (text/plain), 3.21 KB, created by Katrin Fischer on 2014-10-10 15:21:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-10-10 15:21:49 UTC

Size: 3.21 KB

patch

obsolete

>From c45d33ed3c8448616d5a19635524a6f165f350c0 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 26 Sep 2014 17:14:00 +0200
>Subject: [PATCH] [PASSED QA] 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 <Katrin.Fischer.83@web.de>
>Small change: Removed 2 tabs in claims.tt and fixed order
>of ISSN/Issue number column descriptions as they were switched.
>
>Note: The <order> tags are currently not stripped out of the
>notice.
>---
> 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 49b8448..4eb131a 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 @@
>                         <th>Vendor</th>
>                         <th>Library</th>
>                         <th class="anti-the">Title</th>
>+                        <th>ISSN</th>
>                         <th>Issue number</th>
>                         <th>Status</th>
>                         <th class="title-string">Since</th>
>@@ -294,6 +295,7 @@
>                         <td>
>                         <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid %]">[% missingissue.title |html %]</a>
>                         </td>
>+                        <td>[% missingissue.issn %]</td>
>                         <td>[% missingissue.serialseq %]</td>
>                         <td>
>                             [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
>diff --git a/t/db_dependent/Serials/Claims.t b/t/db_dependent/Serials/Claims.t
>index a90563d..60f851a 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',
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 5342: 8115 | 8116 | 8309 | 8334 | 8335 | 8611 | 8682 | 8683 | 8900 | 8910 | 9168 | 9169 | 9976 | 9977 | 10211 | 10212 | 10245 | 10258 | 14444 | 14445 | 14446 | 16217 | 16218 | 16219 | 19512 | 31277 | 31375 | 31454 | 31694 | 31902 | 32171 | 32172