Bugzilla – Attachment 156098 Details for
Bug 14092
Add ability to search on 'all statuses' to orders search
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14092: (QA follow-up) Avoid fiddling with he hash in the template
Bug-14092-QA-follow-up-Avoid-fiddling-with-he-hash.patch (text/plain), 2.39 KB, created by
Katrin Fischer
on 2023-09-22 14:15:34 UTC
(
hide
)
Description:
Bug 14092: (QA follow-up) Avoid fiddling with he hash in the template
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-09-22 14:15:34 UTC
Size:
2.39 KB
patch
obsolete
>From d326f14bac763a0574808a5452bf425507fcdc7e Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer@bsz-bw.de> >Date: Fri, 22 Sep 2023 14:11:23 +0000 >Subject: [PATCH] Bug 14092: (QA follow-up) Avoid fiddling with he hash in the > template > >--- > C4/Acquisition.pm | 2 +- > acqui/duplicate_orders.pl | 6 ------ > acqui/histsearch.pl | 6 ------ > 3 files changed, 1 insertion(+), 13 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index da62c17afe..370030895e 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -2277,7 +2277,7 @@ sub GetHistory { > push @query_params, $to_placed_on; > } > >- if ( defined $orderstatus and $orderstatus ne '') { >+ if ( defined $orderstatus and $orderstatus ne '' and $orderstatus ne 'any') { > $query .= " AND aqorders.orderstatus = ? "; > push @query_params, "$orderstatus"; > } >diff --git a/acqui/duplicate_orders.pl b/acqui/duplicate_orders.pl >index d8f38993be..d37b3f3240 100755 >--- a/acqui/duplicate_orders.pl >+++ b/acqui/duplicate_orders.pl >@@ -85,7 +85,6 @@ if ( $op eq 'select' ) { > > # Set filter for 'all status' > if ( $filters->{orderstatus} eq "any" ) { >- delete( $filters->{orderstatus} ); > $filters->{get_canceled_order} = 1; > } > >@@ -94,11 +93,6 @@ if ( $op eq 'select' ) { > ( grep {$_ eq $order->{ordernumber}} @ordernumbers ) ? () : $order > } @{ C4::Acquisition::GetHistory(%$filters) }; > >- # Reset order status for 'all status' >- if ( $filters->{get_canceled_order} ) { >- $filters->{orderstatus} = "any"; >- } >- > @selected_order_loop = > scalar @ordernumbers > ? @{ C4::Acquisition::GetHistory( ordernumbers => \@ordernumbers ) } >diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl >index 289c1c1e59..571cbeb132 100755 >--- a/acqui/histsearch.pl >+++ b/acqui/histsearch.pl >@@ -116,7 +116,6 @@ $filters->{additional_fields} = \@additional_field_filters; > > # Set filter for 'all status' > if ( $filters->{orderstatus} eq "any" ) { >- delete( $filters->{orderstatus} ); > $filters->{get_canceled_order} = 1; > } > >@@ -126,11 +125,6 @@ if ($do_search) { > $order_loop = GetHistory(%$filters); > } > >-# Reset order status for 'all status' >-if ( $filters->{get_canceled_order} ) { >- $filters->{orderstatus} = "any"; >-} >- > my $budgetperiods = C4::Budgets::GetBudgetPeriods; > my $bp_loop = $budgetperiods; > for my $bp ( @{$budgetperiods} ) { >-- >2.30.2
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 14092
:
38702
|
155851
|
155853
|
156093
|
156097
|
156098
|
156100
|
156101
|
156526
|
156527
|
156590
|
156591