X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Frouting.pl;h=524c71ddcced4f364010be26fbb179d75d2dbe86;hb=aacf00e94bc6aded555624aae834f045c8a17700;hp=9580dca8d7de6922bcf0c4c5bc1419d73acb1d21;hpb=8ad2c7d7acc3cb0033426bd78928214a22ad9dd1;p=koha_fer

diff --git a/serials/routing.pl b/serials/routing.pl
index 9580dca8d7..524c71ddcc 100755
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -11,9 +11,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 =head1 Routing.pl
@@ -49,6 +49,7 @@ my $borrowernumber = $query->param('borrowernumber');
 my $notes = $query->param('notes');
 my $op = $query->param('op') || q{};
 my $date_selected = $query->param('date_selected');
+$date_selected ||= q{};
 my $dbh = C4::Context->dbh;
 
 if($op eq 'delete'){
@@ -68,20 +69,20 @@ if($op eq 'save'){
 my ($routing, @routinglist) = getroutinglist($subscriptionid);
 my $subs = GetSubscription($subscriptionid);
 my ($count,@serials) = GetSerials($subscriptionid);
-my ($serialdates) = GetLatestSerials($subscriptionid,$count);
-
-my @dates;
-my $i=0;
-foreach my $dateseq (@$serialdates) {
-        $dates[$i]->{'planneddate'} = $dateseq->{'planneddate'};
-        $dates[$i]->{'serialseq'} = $dateseq->{'serialseq'};
-        $dates[$i]->{'serialid'} = $dateseq->{'serialid'};
-        if($date_selected eq $dateseq->{'serialid'}){
-            $dates[$i]->{'selected'} = ' selected';
-        } else {
-            $dates[$i]->{'selected'} = '';
-        }
-        $i++;
+my $serialdates = GetLatestSerials($subscriptionid,$count);
+
+my $dates = [];
+foreach my $dateseq (@{$serialdates}) {
+    my $d = {};
+    $d->{planneddate} = $dateseq->{planneddate};
+    $d->{serialseq} = $dateseq->{serialseq};
+    $d->{serialid} = $dateseq->{serialid};
+    if($date_selected eq $dateseq->{serialid}){
+        $d->{selected} = ' selected';
+    } else {
+        $d->{selected} = q{};
+    }
+    push @{$dates}, $d;
 }
 
 my ($template, $loggedinuser, $cookie)
@@ -92,19 +93,6 @@ my ($template, $loggedinuser, $cookie)
 				flagsrequired => {serials => 1},
 				debug => 1,
 				});
-# my $date;
-# if($serialseq){
-#    for(my $i = 0;$i<@serials; $i++){
-#	if($serials[$i]->{'serialseq'} eq $serialseq){
-#	    $date = $serials[$i]->{'planneddate'}
-#	}
-#    }
-# } else {
-#    $serialseq = $serials[0]->{'serialseq'};
-#    $date = $serials[0]->{'planneddate'};
-# }
-
-# my $issue = "$serialseq ($date)";
 
 my @results;
 my $data;
@@ -154,7 +142,7 @@ $template->param(
     subscriptionid => $subscriptionid,
     memberloop => \@results,
     op => $new,
-    dates => \@dates,
+    dates => $dates,
     routingnotes => $serials[0]->{'routingnotes'},
     );