Looks like a bit of stray text there, probably from resolving a merge conflict ( I see a lot of lines like that ;) ). I suppose it isn't supposed to be there.
Thanks. On Thu, 2009-05-28 at 18:33 +0200, [email protected] wrote: > From: Paul Poulain <[email protected]> > > and incompatible with hdl stuff > --- > .../prog/en/modules/suggestion/acceptorreject.tmpl | 80 ++-- > .../en/modules/suggestion/acceptorrejectpd.tmpl | 442 +++++++++++++++ > .../en/modules/suggestion/suggestiondetails.tmpl | 580 > ++++++++++++++++++++ > .../en/modules/suggestion/suggestiondetailspd.tmpl | 551 +++++++++++++++++++ > .../prog/en/modules/opac-suggestions.tmpl | 9 +- > opac/opac-suggestions.pl | 32 +- > suggestion/acceptorreject.pl | 21 + > suggestion/acceptorrejectpd.pl | 267 +++++++++ > suggestion/suggestiondetails.pl | 451 +++++++++++++++ > suggestion/suggestiondetailspd.pl | 428 +++++++++++++++ > 10 files changed, 2801 insertions(+), 60 deletions(-) > create mode 100644 > koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorrejectpd.tmpl > create mode 100644 > koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestiondetails.tmpl > create mode 100644 > koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestiondetailspd.tmpl > create mode 100755 suggestion/acceptorrejectpd.pl > create mode 100755 suggestion/suggestiondetails.pl > create mode 100755 suggestion/suggestiondetailspd.pl > [snip] > diff --git a/suggestion/acceptorreject.pl b/suggestion/acceptorreject.pl > index 12e2f13..d4615a1 100755 > --- a/suggestion/acceptorreject.pl > +++ b/suggestion/acceptorreject.pl > @@ -186,3 +186,24 @@ $template->param( > ); > > output_html_with_http_headers $input, $cookie, $template->output; > +my @allsuggestions; > +foreach my $status ('ASKED','CHECKED','REJECTED','ACCEPTED'){ > + my $suggestions = &GetSuggestionByStatus( $status, $branchcode ); > + map{ > + $_->{$status}=1 unless ($status eq 'ASKED' ||$status eq 'PENDING'); > + $_->{'reasonsloop'}=$reasonsloop; > + $_->{'suggestioncreatedon'}=format_date($_->{'suggestioncreatedon'}) > + } @$suggestions; > + > + push @allsuggestions,{"suggestiontype"=>($status eq 'ASKED'?"pending":lc > $status), > + 'suggestions_loop'=>$suggestions, > + 'reasonsloop' => $reasonsloop}; > +} This line below. > +>>>>>>> suggestions changes (probably useless):suggestion/acceptorreject.pl > +$template->param( > + suggestions => \...@allsuggestions, > + "op_$op" => 1, > + dateformat => C4::Context->preference("dateformat"), > +); > + > +output_html_with_http_headers $input, $cookie, $template->output; [snip] -- Michael Hafen Systems Analyst and Programmer Washington County School District Utah, USA for Koha checkout http://development.washk12.org/gitweb/ or git://development.washk12.org/koha _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
