Attachment 37764 Details for Bug 13813 – Bug 13813 - Remove C4::Dates from C4/Suggestions.pm

[patch] Bug 13813 - Remove C4::Dates from C4/Suggestions.pm

Bug-13813---Remove-C4Dates-from-C4Suggestionspm.patch (text/plain), 1.90 KB, created by Marc Véron on 2015-04-13 15:46:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-04-13 15:46:04 UTC

Size: 1.90 KB

patch

obsolete

>From c037e2c4d5b4e06705a617424184fedde795fc1a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Sat, 14 Mar 2015 16:31:14 +0100
>Subject: [PATCH] Bug 13813 - Remove C4::Dates from C4/Suggestions.pm
>
>To test:
>Apply patch
>Go to Home > Acquisitions > Suggestions management
>Verify in "Filter by" that filter works for Suggestion information / dates
>
>Amended following comment #58 /mv
>---
> C4/Suggestions.pm |    9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
>index f34c942..f9b43a0 100644
>--- a/C4/Suggestions.pm
>+++ b/C4/Suggestions.pm
>@@ -25,13 +25,11 @@ use CGI qw ( -utf8 );
> 
> use C4::Context;
> use C4::Output;
>-use C4::Dates qw(format_date format_date_in_iso);
> use C4::Debug;
> use C4::Letters;
>-use Koha::DateUtils qw( dt_from_string );
>+use Koha::DateUtils;
> 
> use List::MoreUtils qw(any);
>-use C4::Dates qw(format_date_in_iso);
> use base qw(Exporter);
> 
> our $VERSION = 3.07.00.049;
>@@ -174,16 +172,15 @@ sub SearchSuggestion {
>     }
> 
>     # filter on date fields
>-    my $today = C4::Dates->today('iso');
>     foreach my $field (qw( suggesteddate manageddate accepteddate )) {
>         my $from = $field . "_from";
>         my $to   = $field . "_to";
>         if ( $suggestion->{$from} || $suggestion->{$to} ) {
>             push @query, qq{ AND suggestions.$field BETWEEN ? AND ? };
>             push @sql_params,
>-              format_date_in_iso( $suggestion->{$from} ) || '0000-00-00';
>+              output_pref({ dt => dt_from_string( $suggestion->{$from} ), dateformat => 'iso', dateonly => 1 }) || '0000-00-00';
>             push @sql_params,
>-              format_date_in_iso( $suggestion->{$to} ) || $today;
>+              output_pref({ dt => dt_from_string( $suggestion->{$to} ), dateformat => 'iso', dateonly => 1 }) || output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>         }
>     }
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13813: 36827 | 36828 | 36829 | 36830 | 36831 | 36832 | 36835 | 36836 | 36839 | 36845 | 36850 | 36851 | 36855 | 36857 | 36858 | 36859 | 36862 | 36863 | 36864 | 36865 | 36870 | 36871 | 36872 | 36878 | 36879 | 36880 | 36881 | 36882 | 36883 | 36884 | 36885 | 36886 | 36887 | 36888 | 36889 | 36890 | 36892 | 36893 | 36894 | 36895 | 36896 | 36897 | 36898 | 36899 | 36900 | 36901 | 36902 | 37227 | 37730 | 37731 | 37732 | 37736 | 37737 | 37746 | 37748 | 37749 | 37753 | 37754 | 37757 | 37762 | 37763 | 37764 | 37765 | 37766 | 37767 | 37768 | 37770 | 37810 | 37828 | 37835 | 37839 | 37840 | 37841 | 37842 | 37843 | 37853 | 37854 | 37855 | 37856 | 37857 | 37858 | 37859 | 37860 | 37861 | 37862 | 37863 | 37864 | 37865 | 37866 | 37867 | 37868 | 37869 | 37870 | 37871 | 37872 | 37873 | 37874 | 37875 | 37876 | 37877 | 37878 | 37879 | 37880 | 37881 | 37882 | 37883 | 37884 | 37885 | 37886 | 37887 | 37888 | 37889 | 37890 | 37891 | 39666 | 40894 | 42052 | 42175 | 42274 | 42286 | 42292 | 42293 | 42294