From c2ea31931cc246fd1c89720192456090cae460da Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 5 Jun 2013 10:01:17 -0400 Subject: [PATCH] Bug 10382 - collection not returning to null when removed from course reserves Test Plan: 1) Create an item, do not set a collection code 2) Add the item to a course, and choose to set a collection code 3) Ensure the course is enabled, and the collection code is now visible 4) Disable the course, ensure the collection code is no longer visible Signed-off-by: Josef Moravec --- C4/CourseReserves.pm | 6 +++--- .../prog/en/modules/course_reserves/add_items-step2.tt | 8 ++++---- .../prog/en/modules/course_reserves/course-details.tt | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm index 3a3f422..19ed685 100644 --- a/C4/CourseReserves.pm +++ b/C4/CourseReserves.pm @@ -604,7 +604,7 @@ sub _ModStoredFields { my ( @fields_to_update, @values_to_update ); foreach (@FIELDS) { - if ( $params{$_} ) { + if ( defined($params{$_}) ) { push( @fields_to_update, $_ ); push( @values_to_update, $params{$_} ); } @@ -670,9 +670,9 @@ sub _SwapAllFields { my %course_item_fields; my %item_fields; foreach (@FIELDS) { - if ( $course_item->{$_} ) { + if ( defined( $course_item->{$_} ) ) { $course_item_fields{$_} = $course_item->{$_}; - $item_fields{$_} = $item->{$_}; + $item_fields{$_} = $item->{$_} || q{}; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 02a531c..0d9359e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -39,7 +39,7 @@ [% FOREACH it IN itypes %] - [% IF course_item.itype && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %] + [% IF course_item.itype.defined && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %] [% ELSE %] @@ -55,7 +55,7 @@ [% FOREACH c IN ccodes %] - [% IF course_item.ccode && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %] + [% IF course_item.ccode.defined && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %] [% ELSE %] @@ -70,7 +70,7 @@ [% FOREACH s IN locations %] - [% IF course_item.location && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %] + [% IF course_item.location.defined && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %] [% ELSE %] @@ -84,7 +84,7 @@