Attachment 35602 Details for Bug 13007 – Bug 13007: Special case budgetid == ''

[patch] Bug 13007: Special case budgetid == ''

Bug-13007-Special-case-budgetid--.patch (text/plain), 2.35 KB, created by Jonathan Druart on 2015-01-29 09:23:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-01-29 09:23:31 UTC

Size: 2.35 KB

patch

obsolete

>From 6a3e3cef7fc2f9ad2558e5d54ecaca2e261b6b9c Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 18 Nov 2014 10:20:56 +0100
>Subject: [PATCH] Bug 13007: Special case budgetid == ''
>
>In this special case (the suggestion is linked to "all funds"), the
>budgetid value should be NULL in DB.
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Works as described, passes old and new tests.
>---
> C4/Suggestions.pm            |  2 ++
> t/db_dependent/Suggestions.t | 13 ++++++++++---
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
>index 2ffeeaf..f3d6348 100644
>--- a/C4/Suggestions.pm
>+++ b/C4/Suggestions.pm
>@@ -437,6 +437,7 @@ sub NewSuggestion {
>         accepteddate
>         rejectedby
>         rejecteddate
>+        budgetid
>     ) ) {
>         # Set the fields to NULL if not given.
>         $suggestion->{$field} ||= undef;
>@@ -475,6 +476,7 @@ sub ModSuggestion {
>         accepteddate
>         rejectedby
>         rejecteddate
>+        budgetid
>     ) ) {
>         # Set the fields to NULL if not given.
>         $suggestion->{$field} = undef
>diff --git a/t/db_dependent/Suggestions.t b/t/db_dependent/Suggestions.t
>index 49c6c5c..2251196 100644
>--- a/t/db_dependent/Suggestions.t
>+++ b/t/db_dependent/Suggestions.t
>@@ -24,7 +24,7 @@ use C4::Budgets;
> 
> use Koha::DateUtils qw( dt_from_string );
> 
>-use Test::More tests => 102;
>+use Test::More tests => 104;
> use Test::Warn;
> 
> BEGIN {
>@@ -318,6 +318,13 @@ is(@$itemtypes2, 8, "Purchase suggestion itemtypes collected, default AdvancedSe
> 
> is_deeply($itemtypes1, $itemtypes2, 'same set of purchase suggestion formats retrieved');
> 
>-$dbh->rollback;
>+# Test budgetid fk
>+$my_suggestion->{budgetid} = ''; # If budgetid == '', NULL should be set in DB
>+my $my_suggestionid_test_budgetid = NewSuggestion($my_suggestion);
>+$suggestion = GetSuggestion($my_suggestionid_test_budgetid);
>+is( $suggestion->{budgetid}, undef, 'NewSuggestion Should set budgetid to NULL if equals an empty string' );
> 
>-done_testing;
>+$my_suggestion->{budgetid} = ''; # If budgetid == '', NULL should be set in DB
>+ModSuggestion( $my_suggestion );
>+$suggestion = GetSuggestion($my_suggestionid_test_budgetid);
>+is( $suggestion->{budgetid}, undef, 'NewSuggestion Should set budgetid to NULL if equals an empty string' );
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 13007: 31924 | 31945 | 33241 | 33242 | 33643 | 33644 | 33651 | 33653 | 33807 | 33808 | 35601 | 35602