X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Felements%2Fsearch.html;h=64f3a665f13bbfebf5bcc7ce02ee513133336c48;hb=95606bc9db41352511c886773a311f2166cc6cf2;hp=62a0e47868fbc61f755883472a05228665ada4cf;hpb=c422010521a7c09673a8d4d0068d3fd482dd2dbc;p=freeside.git diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 62a0e4786..64f3a665f 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -386,10 +386,7 @@ unless ( $type =~ /^(csv|xml|\w*.xls)$/) { } #order by override -my $order_by = ''; -#if ( $cgi->param('order_by') =~ /^([\w\, ]+)$/ ) { -# $order_by = $1; -#} +my $order_by = $opt{order_by} || ''; $order_by = $cgi->param('order_by') if $cgi->param('order_by'); # run the query @@ -415,6 +412,8 @@ if ( ref($opt{query}) ) { } } + $opt{query}->{'order_by'} .= " $limit"; + } elsif (ref($opt{query}) eq 'ARRAY') { @query = @{ $opt{query} }; } else { @@ -434,7 +433,7 @@ if ( ref($opt{query}) ) { } @query ], - 'order_by' => $opt{order_by}. " ". $limit, + #'order_by' => $opt{order_by}. " ". $limit, ) ]; } else {