Hey Chris,
Could you rebase and re-submit ... this patch didn't apply cleanly,
I'm guessing it's conflicting with one of atz's recent patches
to Lists.
Thanks!
Josh
On Thu, Jun 19, 2008 at 09:12:24PM -0500, Chris Nighswonger wrote:
> ---
> C4/VirtualShelves.pm | 4 ++--
> C4/VirtualShelves/Page.pm | 2 ++
> .../prog/en/modules/virtualshelves/shelves.tmpl | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
> index 3a21913..125b37a 100644
> --- a/C4/VirtualShelves.pm
> +++ b/C4/VirtualShelves.pm
> @@ -224,12 +224,12 @@ sub GetShelfContents {
> my ( $shelfnumber ,$sortfield) = @_;
> my $dbh=C4::Context->dbh();
> if(!$sortfield) {
> - my $sthsort = $dbh->prepare('select sortfield from
> virtualshelves where shelfnumber=?');
> + my $sthsort = $dbh->prepare('SELECT sortfield FROM
> virtualshelves WHERE shelfnumber=?');
> $sthsort->execute($shelfnumber);
> ($sortfield) = $sthsort->fetchrow_array;
> }
> my $query =
> - " SELECT vc.biblionumber, vc.shelfnumber,
> + " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded,
> biblio.*, biblioitems.itemtype, itemtypes.*
> FROM virtualshelfcontents vc
> LEFT JOIN biblio ON vc.biblionumber =
> biblio.biblionumber
> diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
> index 46d5e39..c8d2cd0 100755
> --- a/C4/VirtualShelves/Page.pm
> +++ b/C4/VirtualShelves/Page.pm
> @@ -30,6 +30,7 @@ use C4::Koha;
> use C4::Auth qw/get_session/;
> use C4::Members;
> use C4::Output;
> +use C4::Date qw/format_date/;
> use Exporter;
>
> use vars qw($debug @EXPORT @ISA $VERSION);
> @@ -157,6 +158,7 @@ SWITCH: {
> for my $this_item (@$items) {
> $this_item->{imageurl} =
> $imgdir."/".$itemtypes->{ $this_item->{itemtype} }->{'imageurl'};
> $this_item->{'description'} = $itemtypes->{
> $this_item->{itemtype} }->{'description'};
> + $this_item->{'dateadded'} =
> format_date($this_item->{'dateadded'});
> }
> $showadd = 1;
> my $i = 0;
> diff --git
> a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
> b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
> index b322550..bab4878 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
> @@ -154,7 +154,7 @@ $(document).ready(function(){
> <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
> NAME="subtitle" --></a>
> </td>
> <td><!-- TMPL_VAR NAME="author" --></td>
> - <td><!-- TMPL_VAR NAME="classification" --></td>
> + <td><!-- TMPL_VAR NAME="dateadded" --></td>
> <td>
> <!-- TMPL_UNLESS name="notforloan" -->
> <a
> href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR
> NAME="biblionumber" -->">Holds</a>
> --
> 1.5.5.GIT
>
> _______________________________________________
> Koha-patches mailing list
> [email protected]
> http://lists.koha.org/mailman/listinfo/koha-patches
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
