Attachment 70113 Details for Bug 19200 – Bug 19200: Preventing warns when exporting a basket

[patch] Bug 19200: Preventing warns when exporting a basket

Bug-19200-Preventing-warns-when-exporting-a-basket.patch (text/plain), 2.09 KB, created by Marcel de Rooy on 2017-12-22 10:26:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-12-22 10:26:08 UTC

Size: 2.09 KB

patch

obsolete

>From d80d2659c4594398c06b938a59a89eba6ad91b40 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Tue, 29 Aug 2017 21:07:39 +0000
>Subject: [PATCH] Bug 19200: Preventing warns when exporting a basket
>Content-Type: text/plain; charset=utf-8
>
>To test:
>1) Go to Tools -> CSV profiles -> New CSV Profile
>2) Create a new CSV profile with any name of SQL fields. Ensure profile
>type: SQL and usage: basket export in acquisition
>3) Go to Acquisitions -> Find or create a vendor -> Use or create a
>basket
>4) Click the dropdown menu next to the 'Export as CSV' button. There
>should be a 'Default' option and your new CSV profile (at least)
>5) Click the 'Default' option. Notice warns
>6) Click the 'Export as CSV' button. Notice warns
>7) Click your new CSV profile option. Notice warns
>8) Apply patch and refresh page
>9) Repeat steps 5-7, confirm that warns do not show
>10) Confirm export still works as expected
>
>Sponsored-by: Catalyst IT
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Jon Knight <J.P.Knight@lboro.ac.uk>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> acqui/basket.pl | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/acqui/basket.pl b/acqui/basket.pl
>index 0719618..8df5f8b 100755
>--- a/acqui/basket.pl
>+++ b/acqui/basket.pl
>@@ -170,11 +170,13 @@ if ( $op eq 'delete_confirm' ) {
>         -type       => 'text/csv',
>         -attachment => 'basket' . $basket->{'basketno'} . '.csv',
>     );
>-    if ( $query->param('csv_profile') eq 'default'){
>-        print GetBasketAsCSV($query->param('basketno'), $query);
>+    my $csv_profile_id = $query->param('csv_profile');
>+    if (defined $csv_profile_id) {
>+        # using a csv profile
>+        print GetBasketAsCSV(scalar $query->param('basketno'), $query, $csv_profile_id);
>     } else {
>-        my $csv_profile_id = $query->param('csv_profile');
>-        print  GetBasketAsCSV($query->param('basketno'), $query, $csv_profile_id);
>+        # using default
>+        print GetBasketAsCSV(scalar $query->param('basketno'), $query);
>     }
>     exit;
> } elsif ($op eq 'email') {
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19200: 66602 | 67799 | 69959 | 70113 | 70114