From 95086a918e4b11530eb82ef5db76a7190314b230 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
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 <josef.moravec@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b1bb9f9e6b028dce0109755180100e4033424227)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9b428ec7ed43c3926483aa692315efdebb545f7b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 C4/CourseReserves.pm                             |  6 +++---
 .../modules/course_reserves/add_items-step2.tt   | 16 ++++++++--------
 .../en/modules/course_reserves/course-details.tt |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm
index 3a3f422a96..19ed685c3c 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 d530405d18..b6a60d5a36 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
@@ -38,8 +38,8 @@
                             <option value="">LEAVE UNCHANGED</option>
 
                             [% FOREACH it IN itypes %]
-                                [% IF course_item.itype && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %]
-                                    <option value="[% it.itemtype %]" selected="selected">[% it.description %]</option>
+                                [% IF course_item.itype.defined && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %]
+                                    <option value="[% it.itemtype | html %]" selected="selected">[% it.description | html %]</option>
                                 [% ELSE %]
                                     <option value="[% it.itemtype %]">[% it.description %]</option>
                                 [% END %]
@@ -54,8 +54,8 @@
                             <option value="">LEAVE UNCHANGED</option>
 
                             [% 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 ) ) %]
-                                    <option value="[% c.authorised_value %]" selected="selected">[% c.lib %]</option>
+                                [% IF course_item.ccode.defined && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %]
+                                    <option value="[% c.authorised_value | html %]" selected="selected">[% c.lib | html %]</option>
                                 [% ELSE %]
                                     <option value="[% c.authorised_value %]">[% c.lib %]</option>
                                 [% END %]
@@ -69,8 +69,8 @@
                             <option value="">LEAVE UNCHANGED</option>
 
                             [% 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 ) ) %]
-                                    <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
+                                [% IF course_item.location.defined && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %]
+                                    <option value="[% s.authorised_value | html %]" selected="selected">[% s.lib | html %]</option>
                                 [% ELSE %]
                                     <option value="[% s.authorised_value %]">[% s.lib %]</option>
                                 [% END %]
@@ -83,8 +83,8 @@
                         <select id="holdingbranch" name="holdingbranch">
                             <option value="">LEAVE UNCHANGED</option>
                             [% FOREACH b IN Branches.all() %]
-                                [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.branchcode == item.holdingbranch ) || ( course.enabled == 'no' && b.branchcode == course_item.holdingbranch ) ) %]
-                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
+                                [% IF course_item.holdingbranch.defined && ( ( course.enabled == 'yes' && b.value == item.holdingbranch ) || ( course.enabled == 'no' && b.value == course_item.holdingbranch ) ) %]
+                                    <option value="[% b.branchcode | html %]" selected="selected">[% b.branchname | html %]</option>
                                 [% ELSE %]
                                     <option value="[% b.branchcode %]">[% b.branchname %]</option>
                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
index ecd175402b..ef63625af5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
@@ -119,7 +119,7 @@
                             <td>[% cr.item.itemcallnumber %]</td>
                             [% IF item_level_itypes %]
                             <td>
-                                [% IF cr.course_item.itype %]
+                                [% IF cr.course_item.itype.defined %]
                                     [% IF cr.course_item.enabled == 'yes' %]
                                         [% ItemTypes.GetDescription( cr.item.itype ) %]
                                     [% ELSE %]
@@ -134,7 +134,7 @@
                             </td>
                             [% END %]
                             <td>
-                                 [% IF cr.course_item.ccode %]
+                                 [% IF cr.course_item.ccode.defined %]
                                      [% IF cr.course_item.enabled == 'yes' %]
                                           [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]
                                      [% ELSE %]
@@ -148,7 +148,7 @@
                                  [% END %]
                             </td>
                             <td>
-                                [% IF cr.course_item.location %]
+                                [% IF cr.course_item.location.defined %]
                                      [% IF cr.course_item.enabled == 'yes' %]
                                          [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]
                                     [% ELSE %]
@@ -162,7 +162,7 @@
                                 [% END %]
                             </td>
                             <td>
-                                [% IF cr.course_item.holdingbranch %]
+                                [% IF cr.course_item.holdingbranch.defined %]
                                     [% IF cr.course_item.enabled == 'yes' %]
                                         [% Branches.GetName( cr.item.holdingbranch ) %]
                                     [% ELSE %]
-- 
2.39.5