Bugzilla – Attachment 692 Details for
Bug 2505
Omnibus: Enable Perl warnings in all modules and scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for opac-topissues.pl
0012-Bug-2505-Enabled-warnings-in-opac-topissues.pl.patch (text/plain), 5.97 KB, created by
Chris Cormack
on 2009-08-14 00:25:00 UTC
(
hide
)
Description:
Patch for opac-topissues.pl
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2009-08-14 00:25:00 UTC
Size:
5.97 KB
patch
obsolete
>From b370ec43feffc5b452f49b8c6419b1151fecbf91 Mon Sep 17 00:00:00 2001 >From: Garry Collum <gcollum@gmail.com> >Date: Thu, 13 Aug 2009 20:24:45 -0400 >Subject: [PATCH] Bug 2505: Enabled warnings in opac-topissues.pl >Content-Type: text/plain; charset="utf-8" > >Fixed resulting warnings and fixed a small bug with the timeLimit drop-down box. It would not retain its value on subsequent pages if 'no Limit' was selected as an option. >--- > .../opac-tmpl/prog/en/modules/opac-topissues.tmpl | 22 +++++++++++-------- > opac/opac-topissues.pl | 21 +++++++++++------- > 2 files changed, 26 insertions(+), 17 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl >index 3208fec..36ba710 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl >@@ -45,8 +45,8 @@ function Dopop(link) { > at > <!-- TMPL_VAR name="branch" --> > <!-- /TMPL_IF --> >- <!-- TMPL_IF name="timeLimit" --> >- in the past <!-- TMPL_VAR name="timeLimit" --> months >+ <!-- TMPL_IF name="timeLimitFinite" --> >+ in the past <!-- TMPL_VAR name="timeLimitFinite" --> months > <!-- TMPL_ELSE --> of all time<!-- /TMPL_IF --> > </caption> > <thead><tr> >@@ -90,9 +90,11 @@ function Dopop(link) { > <select name="branch" id="branch"> > <option value="">All branches</option> > <!-- TMPL_LOOP name="branchloop" --> >- <!-- TMPL_IF EXPR="branch eq branchname" --><option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --> >- <!-- TMPL_VAR name="branchname" --> >- </option> >+ <!-- TMPL_IF name="selected" --> >+ <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="branchname" --></option> >+ <!-- TMPL_ELSE --> >+ <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option> >+ <!-- /TMPL_IF --> > <!-- /TMPL_LOOP --> > </select> > </li> >@@ -100,9 +102,11 @@ function Dopop(link) { > <select name="itemtype" id="itemtype"> > <option value="">All item types</option> > <!-- TMPL_LOOP name="itemtypeloop" --> >- <!-- TMPL_IF EXPR="itemtype eq description" --><option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --> >- <!-- TMPL_VAR name="description" --> >- </option> >+ <!-- TMPL_IF name="selected" --> >+ <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="description" --></option> >+ <!-- TMPL_ELSE --> >+ <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="description" --></option> >+ <!-- /TMPL_IF --> > <!-- /TMPL_LOOP --> > </select></li> > <li> >@@ -129,4 +133,4 @@ function Dopop(link) { > </div></div> > <!-- /TMPL_IF --> > </div> >-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >\ No newline at end of file >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl >index 6b71226..80c4f0b 100755 >--- a/opac/opac-topissues.pl >+++ b/opac/opac-topissues.pl >@@ -19,6 +19,8 @@ > # Suite 330, Boston, MA 02111-1307 USA > > use strict; >+use warnings; >+ > use CGI; > use C4::Auth; > use C4::Context; >@@ -52,14 +54,14 @@ my ($template, $borrowernumber, $cookie) > my $dbh = C4::Context->dbh; > # Displaying results > my $limit = $input->param('limit') || 10; >-my $branch = $input->param('branch'); >-my $itemtype = $input->param('itemtype'); >+my $branch = $input->param('branch') || ''; >+my $itemtype = $input->param('itemtype') || ''; > my $timeLimit = $input->param('timeLimit') || 3; >-my $whereclause; >+my $whereclause = ''; > $whereclause .= 'items.homebranch='.$dbh->quote($branch)." AND " if ($branch); > $whereclause .= 'biblioitems.itemtype='.$dbh->quote($itemtype)." AND " if $itemtype; > $whereclause .= ' TO_DAYS(NOW()) - TO_DAYS(biblio.datecreated) <= '.($timeLimit*30).' AND ' if $timeLimit < 999; >-$whereclause =~ s/ AND $//; >+$whereclause =~ s/ AND $// if $whereclause; > $whereclause = " WHERE ".$whereclause if $whereclause; > > my $query = "SELECT datecreated, biblio.biblionumber, title, >@@ -84,12 +86,13 @@ while (my $line= $sth->fetchrow_hashref) { > push @results, $line; > } > >-if($timeLimit eq 999){ $timeLimit = 0 }; >+my $timeLimitFinite = $timeLimit; >+if($timeLimit eq 999){ $timeLimitFinite = 0 }; > > $template->param(do_it => 1, > limit => $limit, >- branch => $branches->{$branch}->{branchname}, >- itemtype => $itemtypes->{$itemtype}->{description}, >+ branch => $branches->{$branch}->{branchname} || 'all locations', >+ itemtype => $itemtypes->{$itemtype}->{description} || 'item types', > timeLimit => $timeLimit, > results_loop => \@results, > ); >@@ -100,9 +103,11 @@ $template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'} > $itemtypes = GetItemTypes; > my @itemtypeloop; > foreach my $thisitemtype (sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) { >+ my $selected = 1 if $thisitemtype eq $itemtype; > my %row =(value => $thisitemtype, > description => $itemtypes->{$thisitemtype}->{'description'}, >- ); >+ selected => $selected, >+ ); > push @itemtypeloop, \%row; > } > >-- >1.5.6.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2505
:
686
|
687
|
688
|
689
|
690
|
691
|
692
|
693
|
694
|
695
|
696
|
697
|
698
|
699
|
700
|
701
|
702
|
703
|
704
|
705
|
706
|
707
|
708
|
709
|
2223
|
3884
|
4574
|
8209
|
8317
|
8322
|
8373
|
9034
|
9035
|
9036
|
34442