From 3c66d332fb2399e13274932082b8df20e33a1c57 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 Nov 2014 10:20:56 +0100 Subject: [PATCH] [PASSED QA] 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 Signed-off-by: Katrin Fischer Works as described, passes old and new tests. --- C4/Suggestions.pm | 2 ++ t/db_dependent/Suggestions.t | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 1d9edbb..ee421d9 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -436,6 +436,7 @@ sub NewSuggestion { accepteddate rejectedby rejecteddate + budgetid ) ) { # Set the fields to NULL if not given. $suggestion->{$field} ||= undef; @@ -474,6 +475,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 47e5ad4..dc9d131 100644 --- a/t/db_dependent/Suggestions.t +++ b/t/db_dependent/Suggestions.t @@ -23,7 +23,7 @@ use C4::Letters; use Koha::DateUtils qw( dt_from_string ); -use Test::More tests => 98; +use Test::More tests => 100; use Test::Warn; BEGIN { @@ -274,4 +274,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' ); + +$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' ); -- 1.9.1