X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fview_holdsqueue.pl;h=41db32bce96b41e28bf58f298551ade4442743a3;hb=788bf6e86c0a7cdecda4a6e011bffa6013abf6ac;hp=a52400bdd8bc95edd91547265cc2628a35f4104e;hpb=bb9aeaeec8fe7141df22463c9a0231e84f9ca3ee;p=koha_fer

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index a52400bdd8..41db32bce9 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -29,9 +29,9 @@ use C4::Auth;
 use C4::Output;
 use C4::Biblio;
 use C4::Items;
-use C4::Koha;                  # GetItemTypes
+use C4::Koha;   # GetItemTypes
 use C4::Branch; # GetBranches
-use C4::Dates qw/format_date/;
+use C4::HoldsQueue qw(GetHoldsQueueItems);
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -40,80 +40,41 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
 );
 
 my $params = $query->Vars;
-my $run_report = $params->{'run_report'};
-my $branchlimit = $params->{'branchlimit'};
+my $run_report     = $params->{'run_report'};
+my $branchlimit    = $params->{'branchlimit'};
 my $itemtypeslimit = $params->{'itemtypeslimit'};
 
 if ( $run_report ) {
-    my $items = GetHoldsQueueItems( $branchlimit,$itemtypeslimit );
+    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
+    my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
-					 branch    => $branchlimit,
-                     total     => scalar @$items,
-                     itemsloop => $items,
-                     run_report => $run_report,
-                     dateformat => C4::Context->preference("dateformat"),
-                 );
-}
-
-# getting all branches.
-my $branches = GetBranches;
-my $branch   = C4::Context->userenv->{"branchname"};
-my @branchloop;
-foreach my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches ) {
-    my $selected = 1 if $thisbranch eq $branch;
-    my %row = (
-        value      => $thisbranch,
-        selected   => $selected,
-        branchname => $branches->{$thisbranch}->{'branchname'},
+        branchlimit     => $branchlimit,
+        total      => scalar @$items,
+        itemsloop  => $items,
+        run_report => $run_report,
     );
-    push @branchloop, \%row;
 }
 
 # getting all itemtypes
 my $itemtypes = &GetItemTypes();
 my @itemtypesloop;
 foreach my $thisitemtype ( sort keys %$itemtypes ) {
-    my %row = (
+    push @itemtypesloop, {
         value       => $thisitemtype,
         description => $itemtypes->{$thisitemtype}->{'description'},
-    );
-    push @itemtypesloop, \%row;
+    };
 }
 
-$template->param( branchloop     => \@branchloop,
-                  itemtypeloop   => \@itemtypesloop,
+$template->param(
+     branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
+   itemtypeloop => \@itemtypesloop,
 );
 
-sub GetHoldsQueueItems {
-	my ($branchlimit,$itemtypelimit) = @_;
-	my $dbh = C4::Context->dbh;
-
-    my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort
-                  FROM tmp_holdsqueue
-                  JOIN biblio USING (biblionumber)
-                  LEFT JOIN items USING (itemnumber)
-                /;
-    if ($branchlimit) {
-	    $query .=" WHERE holdingbranch = ?";
-        push @bind_params, $branchlimit;
-    }
-    $query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
-	my $sth = $dbh->prepare($query);
-	$sth->execute(@bind_params);
-	my $items = [];
-    while ( my $row = $sth->fetchrow_hashref ){
-		$row->{reservedate} = format_date($row->{reservedate});
-        push @$items, $row;
-    }
-    return $items;
-
-}
 # writing the template
 output_html_with_http_headers $query, $cookie, $template->output;