Bugzilla – Attachment 14196 Details for
Bug 9307
Allow libraries to add/edit status for suggestion management.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9307 [1] - Allow libraries to add/edit status for suggestion management. - Perltidy suggestion/suggestion.pl
Bug-9307-1---Allow-libraries-to-addedit-status-for.patch (text/plain), 22.44 KB, created by
Kyle M Hall (khall)
on 2012-12-19 16:33:12 UTC
(
hide
)
Description:
Bug 9307 [1] - Allow libraries to add/edit status for suggestion management. - Perltidy suggestion/suggestion.pl
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2012-12-19 16:33:12 UTC
Size:
22.44 KB
patch
obsolete
>From c9045783086ab19a034e61c8926368d0536734a4 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 19 Dec 2012 08:42:44 -0500 >Subject: [PATCH] Bug 9307 [1] - Allow libraries to add/edit status for suggestion management. - Perltidy suggestion/suggestion.pl > >--- > suggestion/suggestion.pl | 330 +++++++++++++++++++++++---------------------- > 1 files changed, 169 insertions(+), 161 deletions(-) > >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 99f38eb..94088f8 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -18,13 +18,14 @@ > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > use strict; >+ > #use warnings; FIXME - Bug 2505 > require Exporter; > use CGI; > use C4::Auth; # get_template_and_user > use C4::Output; > use C4::Suggestions; >-use C4::Koha; #GetItemTypes >+use C4::Koha; #GetItemTypes > use C4::Branch; > use C4::Budgets; > use C4::Search; >@@ -32,83 +33,86 @@ use C4::Dates qw(format_date); > use C4::Members; > use C4::Debug; > >-sub Init{ >- my $suggestion= shift @_; >+sub Init { >+ my $suggestion = shift @_; >+ > # "Managed by" is used only when a suggestion is being edited (not when created) >- if ($suggestion->{'suggesteddate'} eq "0000-00-00" ||$suggestion->{'suggesteddate'} eq "") { >+ if ( $suggestion->{'suggesteddate'} eq "0000-00-00" || $suggestion->{'suggesteddate'} eq "" ) { >+ > # new suggestion > $suggestion->{'suggesteddate'} = C4::Dates->today; >- $suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'suggestedby'}); >- } >- else { >+ $suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ( $suggestion->{'suggestedby'} ); >+ } else { >+ > # editing of an existing suggestion > $suggestion->{'manageddate'} = C4::Dates->today; >- $suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'}); >+ $suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ( $suggestion->{'managedby'} ); >+ > # suggesteddate, when coming from the DB, needs to be formated >- $suggestion->{'suggesteddate'} = format_date($suggestion->{'suggesteddate'}); >+ $suggestion->{'suggesteddate'} = format_date( $suggestion->{'suggesteddate'} ); > } >- foreach my $date ( qw(rejecteddate accepteddate) ){ >- $suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")? >- "": >- format_date($suggestion->{$date}) >- ); >+ foreach my $date (qw(rejecteddate accepteddate)) { >+ $suggestion->{$date} = ( >+ ( $suggestion->{$date} eq "0000-00-00" || $suggestion->{$date} eq "" ) >+ ? "" >+ : format_date( $suggestion->{$date} ) >+ ); > } >- $suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'}); >+ $suggestion->{'branchcode'} = C4::Context->userenv->{"branch"} unless ( $suggestion->{'branchcode'} ); > } > >-sub GetCriteriumDesc{ >- my ($criteriumvalue,$displayby)=@_; >- return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); >- return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); >- return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); >- if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ >- my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); >+sub GetCriteriumDesc { >+ my ( $criteriumvalue, $displayby ) = @_; >+ return ( $criteriumvalue eq 'ASKED' ? "Pending" : ucfirst( lc($criteriumvalue) ) ) if ( $displayby =~ /status/i ); >+ return ( GetBranchName($criteriumvalue) ) if ( $displayby =~ /branchcode/ ); >+ return ( GetSupportName($criteriumvalue) ) if ( $displayby =~ /itemtype/ ); >+ if ( $displayby =~ /suggestedby/ || $displayby =~ /managedby/ || $displayby =~ /acceptedby/ ) { >+ my $borr = C4::Members::GetMember( borrowernumber => $criteriumvalue ); > return "" unless $borr; > return $$borr{surname} . ", " . $$borr{firstname}; > } >- if ( $displayby =~ /budgetid/) { >+ if ( $displayby =~ /budgetid/ ) { > my $budget = GetBudget($criteriumvalue); > return "" unless $budget; > return $$budget{budget_name}; > } > } > >-my $input = CGI->new; >-my $suggestedbyme = (defined $input->param('suggestedbyme')? $input->param('suggestedbyme'):1); >-my $op = $input->param('op')||'else'; >-my @editsuggestions = $input->param('edit_field'); >-my $suggestedby = $input->param('suggestedby'); >+my $input = CGI->new; >+my $suggestedbyme = ( defined $input->param('suggestedbyme') ? $input->param('suggestedbyme') : 1 ); >+my $op = $input->param('op') || 'else'; >+my @editsuggestions = $input->param('edit_field'); >+my $suggestedby = $input->param('suggestedby'); > my $returnsuggestedby = $input->param('returnsuggestedby'); >-my $returnsuggested = $input->param('returnsuggested'); >-my $managedby = $input->param('managedby'); >-my $displayby = $input->param('displayby') || ''; >-my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : ''; >-my $tabcode = $input->param('tabcode'); >+my $returnsuggested = $input->param('returnsuggested'); >+my $managedby = $input->param('managedby'); >+my $displayby = $input->param('displayby') || ''; >+my $branchfilter = ( $displayby ne "branchcode" ) ? $input->param('branchcode') : ''; >+my $tabcode = $input->param('tabcode'); > > # filter informations which are not suggestion related. >-my $suggestion_ref = $input->Vars; >+my $suggestion_ref = $input->Vars; > > delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode edit_field ); >-foreach (keys %$suggestion_ref){ >- delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' || $op eq 'change')); >+foreach ( keys %$suggestion_ref ) { >+ delete $$suggestion_ref{$_} if ( !$$suggestion_ref{$_} && ( $op eq 'else' || $op eq 'change' ) ); > } > my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( >- { >- template_name => "suggestion/suggestion.tmpl", >- query => $input, >- type => "intranet", >- flagsrequired => { catalogue => 1 }, >- } >- ); >+ { template_name => "suggestion/suggestion.tmpl", >+ query => $input, >+ type => "intranet", >+ flagsrequired => { catalogue => 1 }, >+ } >+); > > ######################################### > ## Operations > ## > if ( $op =~ /save/i ) { >- if ( $$suggestion_ref{"STATUS"} ) { >+ if ( $$suggestion_ref{"STATUS"} ) { > if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) { >- $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today; >- $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" } = C4::Context->userenv->{number}; >+ $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"} ) . "date" } = C4::Dates->today; >+ $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"} ) . "by" } = C4::Context->userenv->{number}; > } > $$suggestion_ref{"manageddate"} = C4::Dates->today; > $$suggestion_ref{"managedby"} = C4::Context->userenv->{number}; >@@ -117,85 +121,85 @@ if ( $op =~ /save/i ) { > &ModSuggestion($suggestion_ref); > } else { > ###FIXME:Search here if suggestion already exists. >- my $suggestions_loop = >- SearchSuggestion( $suggestion_ref ); >- if (@$suggestions_loop>=1){ >- #some suggestion are answering the request Donot Add >- } >- else { >+ my $suggestions_loop = SearchSuggestion($suggestion_ref); >+ if ( @$suggestions_loop >= 1 ) { >+ >+ #some suggestion are answering the request Donot Add >+ } else { > ## Adding some informations related to suggestion > &NewSuggestion($suggestion_ref); > } >+ > # empty fields, to avoid filter in "SearchSuggestion" >- } >- map{delete $$suggestion_ref{$_}} keys %$suggestion_ref; >+ } >+ map { delete $$suggestion_ref{$_} } keys %$suggestion_ref; > $op = 'else'; >-} >-elsif ($op=~/add/) { >- #Adds suggestion >+} elsif ( $op =~ /add/ ) { >+ >+ #Adds suggestion > Init($suggestion_ref); >- $op ='save'; >-} >-elsif ($op=~/edit/) { >- #Edit suggestion >- $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'}); >+ $op = 'save'; >+} elsif ( $op =~ /edit/ ) { >+ >+ #Edit suggestion >+ $suggestion_ref = &GetSuggestion( $$suggestion_ref{'suggestionid'} ); > Init($suggestion_ref); >- $op ='save'; >-} >-elsif ($op eq "change" ) { >+ $op = 'save'; >+} elsif ( $op eq "change" ) { >+ > # set accepted/rejected/managed informations if applicable > # ie= if the librarian has choosen some action on the suggestions >- if ($$suggestion_ref{"STATUS"} eq "ACCEPTED"){ >- $$suggestion_ref{"accepteddate"}=C4::Dates->today; >- $$suggestion_ref{"acceptedby"}=C4::Context->userenv->{number}; >- } elsif ($$suggestion_ref{"STATUS"} eq "REJECTED"){ >- $$suggestion_ref{"rejecteddate"}=C4::Dates->today; >- $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number}; >+ if ( $$suggestion_ref{"STATUS"} eq "ACCEPTED" ) { >+ $$suggestion_ref{"accepteddate"} = C4::Dates->today; >+ $$suggestion_ref{"acceptedby"} = C4::Context->userenv->{number}; >+ } elsif ( $$suggestion_ref{"STATUS"} eq "REJECTED" ) { >+ $$suggestion_ref{"rejecteddate"} = C4::Dates->today; >+ $$suggestion_ref{"rejectedby"} = C4::Context->userenv->{number}; >+ } >+ if ( $$suggestion_ref{"STATUS"} ) { >+ $$suggestion_ref{"manageddate"} = C4::Dates->today; >+ $$suggestion_ref{"managedby"} = C4::Context->userenv->{number}; >+ } >+ if ( my $reason = $$suggestion_ref{"reason$tabcode"} ) { >+ if ( $reason eq "other" ) { >+ $reason = $$suggestion_ref{"other_reason$tabcode"}; >+ } >+ $$suggestion_ref{'reason'} = $reason; >+ } >+ delete $$suggestion_ref{$_} foreach ( "reason$tabcode", "other_reason$tabcode" ); >+ foreach ( keys %$suggestion_ref ) { >+ delete $$suggestion_ref{$_} unless ( $$suggestion_ref{$_} ); > } >- if ($$suggestion_ref{"STATUS"}){ >- $$suggestion_ref{"manageddate"}=C4::Dates->today; >- $$suggestion_ref{"managedby"}=C4::Context->userenv->{number}; >- } >- if ( my $reason = $$suggestion_ref{"reason$tabcode"}){ >- if ( $reason eq "other" ) { >- $reason = $$suggestion_ref{"other_reason$tabcode"}; >- } >- $$suggestion_ref{'reason'}=$reason; >- } >- delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode"); >- foreach (keys %$suggestion_ref){ >- delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_}); >- } > foreach my $suggestionid (@editsuggestions) { > next unless $suggestionid; >- $$suggestion_ref{'suggestionid'}=$suggestionid; >+ $$suggestion_ref{'suggestionid'} = $suggestionid; > &ModSuggestion($suggestion_ref); > } > $op = 'else'; >-}elsif ($op eq "delete" ) { >+} elsif ( $op eq "delete" ) { > foreach my $delete_field (@editsuggestions) { >- &DelSuggestion( $borrowernumber, $delete_field,'intranet' ); >+ &DelSuggestion( $borrowernumber, $delete_field, 'intranet' ); > } > $op = 'else'; >-} >-elsif ( $op eq 'show' ) { >- $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'}); >+} elsif ( $op eq 'show' ) { >+ $suggestion_ref = &GetSuggestion( $$suggestion_ref{'suggestionid'} ); > $$suggestion_ref{branchname} = GetBranchName $$suggestion_ref{branchcode}; > my $budget = GetBudget $$suggestion_ref{budgetid}; > $$suggestion_ref{budgetname} = $$budget{budget_name}; > Init($suggestion_ref); > } >-if ($op=~/else/) { >- $op='else'; >- >- $displayby||="STATUS"; >- delete $$suggestion_ref{'branchcode'} if($displayby eq "branchcode"); >- my $criteria_list=GetDistinctValues("suggestions.".$displayby); >+if ( $op =~ /else/ ) { >+ $op = 'else'; >+ >+ $displayby ||= "STATUS"; >+ delete $$suggestion_ref{'branchcode'} if ( $displayby eq "branchcode" ); >+ my $criteria_list = GetDistinctValues( "suggestions." . $displayby ); > my @allsuggestions; > my $reasonsloop = GetAuthorisedValues("SUGGEST"); > foreach my $criteriumvalue ( map { $$_{'value'} } @$criteria_list ) { >+ > # By default, display suggestions from current working branch >- if(not defined $branchfilter) { >+ if ( not defined $branchfilter ) { > $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'}; > } > my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne ""; >@@ -205,104 +209,109 @@ if ($op=~/else/) { > > my $suggestions = &SearchSuggestion($suggestion_ref); > foreach my $suggestion (@$suggestions) { >- if ($suggestion->{budgetid}){ >+ if ( $suggestion->{budgetid} ) { > my $bud = GetBudget( $suggestion->{budgetid} ); > $suggestion->{budget_name} = $bud->{budget_name} if $bud; > } > foreach my $date (qw(suggesteddate manageddate accepteddate)) { >- if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00") { >+ if ( $suggestion->{$date} and $suggestion->{$date} ne "0000-00-00" ) { > $suggestion->{$date} = format_date( $suggestion->{$date} ); > } else { > $suggestion->{$date} = ""; > } > } > } >- push @allsuggestions,{ >- "suggestiontype"=>$criteriumvalue||"suggest", >- "suggestiontypelabel"=>GetCriteriumDesc($criteriumvalue,$displayby)||"", >- "suggestionscount"=>scalar(@$suggestions), >- 'suggestions_loop'=>$suggestions, >- 'reasonsloop' => $reasonsloop, >- }; >+ push @allsuggestions, >+ { "suggestiontype" => $criteriumvalue || "suggest", >+ "suggestiontypelabel" => GetCriteriumDesc( $criteriumvalue, $displayby ) || "", >+ "suggestionscount" => scalar(@$suggestions), >+ 'suggestions_loop' => $suggestions, >+ 'reasonsloop' => $reasonsloop, >+ }; > > delete $$suggestion_ref{$displayby} unless $definedvalue; > } > > $template->param( >- "displayby"=> $displayby, >- "notabs"=> $displayby eq "", >- suggestions => \@allsuggestions, >+ "displayby" => $displayby, >+ "notabs" => $displayby eq "", >+ suggestions => \@allsuggestions, > ); > } > >-foreach my $element ( qw(managedby suggestedby acceptedby) ) { >-# $debug || warn $$suggestion_ref{$element}; >- if ($$suggestion_ref{$element}){ >- my $member=GetMember(borrowernumber=>$$suggestion_ref{$element}); >+foreach my $element (qw(managedby suggestedby acceptedby)) { >+ >+ # $debug || warn $$suggestion_ref{$element}; >+ if ( $$suggestion_ref{$element} ) { >+ my $member = GetMember( borrowernumber => $$suggestion_ref{$element} ); > $template->param( >- $element."_borrowernumber"=>$$member{borrowernumber}, >- $element."_firstname"=>$$member{firstname}, >- $element."_surname"=>$$member{surname}, >- $element."_branchcode"=>$$member{branchcode}, >- $element."_description"=>$$member{description}, >- $element."_category_type"=>$$member{category_type} >+ $element . "_borrowernumber" => $$member{borrowernumber}, >+ $element . "_firstname" => $$member{firstname}, >+ $element . "_surname" => $$member{surname}, >+ $element . "_branchcode" => $$member{branchcode}, >+ $element . "_description" => $$member{description}, >+ $element . "_category_type" => $$member{category_type} > ); > } > } > $template->param( >- %$suggestion_ref, >- "op_$op" => 1, >- dateformat => C4::Context->preference("dateformat"), >- "op" =>$op, >+ %$suggestion_ref, >+ "op_$op" => 1, >+ dateformat => C4::Context->preference("dateformat"), >+ "op" => $op, > ); > >-if(defined($returnsuggested) and $returnsuggested ne "noone") >-{ >- print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions"); >+if ( defined($returnsuggested) and $returnsuggested ne "noone" ) { >+ print $input->redirect( "/cgi-bin/koha/members/moremember.pl?borrowernumber=" . $returnsuggested . "#suggestions" ); > } > > #################### > ## Initializing selection lists > > #branch display management >-my $onlymine=C4::Context->preference('IndependantBranches') && >- C4::Context->userenv && >- C4::Context->userenv->{flags}!=1 && >- C4::Context->userenv->{branch}; >+my $onlymine = >+ C4::Context->preference('IndependantBranches') >+ && C4::Context->userenv >+ && C4::Context->userenv->{flags} != 1 >+ && C4::Context->userenv->{branch}; > my $branches = GetBranches($onlymine); > my @branchloop; > >-foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches ) { >+foreach my $thisbranch ( sort { $branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'} } keys %$branches ) { > my %row = ( > value => $thisbranch, > branchname => $branches->{$thisbranch}->{'branchname'}, >- selected => ($branchfilter and $branches->{$thisbranch}->{'branchcode'} eq $branchfilter ) || ( $$suggestion_ref{'branchcode'} and $branches->{$thisbranch}->{'branchcode'} eq $$suggestion_ref{'branchcode'} ) >+ selected => ( $branchfilter and $branches->{$thisbranch}->{'branchcode'} eq $branchfilter ) >+ || ( $$suggestion_ref{'branchcode'} and $branches->{$thisbranch}->{'branchcode'} eq $$suggestion_ref{'branchcode'} ) > ); > push @branchloop, \%row; > } >-$branchfilter=C4::Context->userenv->{'branch'} if ($onlymine && !$branchfilter); >+$branchfilter = C4::Context->userenv->{'branch'} if ( $onlymine && !$branchfilter ); > >-$template->param( branchloop => \@branchloop, >- branchfilter => $branchfilter); >+$template->param( >+ branchloop => \@branchloop, >+ branchfilter => $branchfilter >+); > > # the index parameter is different for item-level itemtypes > my $supportlist = GetSupportList(); > > foreach my $support (@$supportlist) { >- $$support{'selected'} = (defined $$suggestion_ref{'itemtype'}) >- ? $$support{'itemtype'} eq $$suggestion_ref{'itemtype'} >- : 0; >+ $$support{'selected'} = >+ ( defined $$suggestion_ref{'itemtype'} ) >+ ? $$support{'itemtype'} eq $$suggestion_ref{'itemtype'} >+ : 0; > if ( $$support{'imageurl'} ) { > $$support{'imageurl'} = getitemtypeimagelocation( 'intranet', $$support{'imageurl'} ); > } else { > delete $$support{'imageurl'}; > } > } >-$template->param(itemtypeloop=>$supportlist); >+$template->param( itemtypeloop => $supportlist ); > $template->param( returnsuggestedby => $returnsuggestedby ); > >-my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patronreason'}); >-$template->param(patron_reason_loop=>$patron_reason_loop); >+my $patron_reason_loop = GetAuthorisedValues( "OPAC_SUG", $$suggestion_ref{'patronreason'} ); >+$template->param( patron_reason_loop => $patron_reason_loop ); > > #Budgets management > my $budgets = []; >@@ -315,28 +324,27 @@ if ($branchfilter) { > > my @budgets_loop; > foreach my $budget ( @{$budgets} ) { >- next unless (CanUserUseBudget($borrowernumber, $budget, $userflags)); >+ next unless ( CanUserUseBudget( $borrowernumber, $budget, $userflags ) ); > > ## Please see file perltidy.ERR > $budget->{'selected'} = 1 >- if ($$suggestion_ref{'budgetid'} >- && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'}); >+ if ( $$suggestion_ref{'budgetid'} >+ && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'} ); > > push @budgets_loop, $budget; > } > >-$template->param( budgetsloop => \@budgets_loop); >-$template->param( "statusselected_$$suggestion_ref{'STATUS'}" =>1) if ($$suggestion_ref{'STATUS'}); >+$template->param( budgetsloop => \@budgets_loop ); >+$template->param( "statusselected_$$suggestion_ref{'STATUS'}" => 1 ) if ( $$suggestion_ref{'STATUS'} ); > > # get currencies and rates >-my @rates = GetCurrencies(); >-my $count = scalar @rates; >+my @rates = GetCurrencies(); >+my $count = scalar @rates; > my $active_currency = GetCurrency(); > my $selected_currency; >-if ($$suggestion_ref{'currency'}) { >+if ( $$suggestion_ref{'currency'} ) { > $selected_currency = $$suggestion_ref{'currency'}; >-} >-else { >+} else { > $selected_currency = $active_currency->{currency}; > } > >@@ -345,29 +353,29 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { > my %line; > $line{currcode} = $rates[$i]->{'currency'}; > $line{rate} = $rates[$i]->{'rate'}; >- $line{selected} = 1 if ($line{'currcode'} eq $selected_currency); >+ $line{selected} = 1 if ( $line{'currcode'} eq $selected_currency ); > push @loop_currency, \%line; > } > >-$template->param(loop_currency => \@loop_currency); >+$template->param( loop_currency => \@loop_currency ); > > $template->param( >- price => sprintf("%.2f", $$suggestion_ref{'price'}||0), >- total => sprintf("%.2f", $$suggestion_ref{'total'}||0), >+ price => sprintf( "%.2f", $$suggestion_ref{'price'} || 0 ), >+ total => sprintf( "%.2f", $$suggestion_ref{'total'} || 0 ), > ); > > my %hashlists; >-foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { >+foreach my $field (qw(managedby acceptedby suggestedby budgetid)) { > my $values_list; > $values_list = GetDistinctValues( "suggestions." . $field ); > my @codes_list = map { >- { 'code' => $$_{'value'}, >- 'desc' => GetCriteriumDesc( $$_{'value'}, $field ), >- 'selected' => ($$suggestion_ref{$field}) ? $$_{'value'} eq $$suggestion_ref{$field} : 0, >+ { 'code' => $$_{'value'}, >+ 'desc' => GetCriteriumDesc( $$_{'value'}, $field ), >+ 'selected' => ( $$suggestion_ref{$field} ) ? $$_{'value'} eq $$suggestion_ref{$field} : 0, > } > } @$values_list; > $hashlists{ lc($field) . "_loop" } = \@codes_list; > } > $template->param(%hashlists); >-$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); >+$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); > output_html_with_http_headers $input, $cookie, $template->output; >-- >1.7.2.5
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=14196">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9307
:
14196
|
14197
|
14211
|
14684
|
16648
|
16785
|
19085
|
19112
|
19113