From fa65335e3fad0e06a6552b2265e8c8aaffa68472 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 6 May 2009 12:43:06 +0000 Subject: [PATCH] Die Felder "transdate" und "reqdate" in "fromdate" und "todate" umbenannt. --- bin/mozilla/am.pl | 6 +++--- templates/webpages/common/search_history_de.html | 16 ++++++++-------- .../webpages/common/search_history_master.html | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index c81281443..f14ea6685 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -2848,9 +2848,9 @@ sub show_am_history { } } $restriction .= - $form->{transdate} ne "" && $form->{reqdate} ne "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'| - : $form->{transdate} ne "" && $form->{reqdate} eq "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'| - : $form->{transdate} eq "" && $form->{reqdate} ne "" ? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'| + $form->{fromdate} ne "" && $form->{todate} ne "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|' AND st.itime::date <= '| . $form->{todate} . qq|'| + : $form->{fromdate} ne "" && $form->{todate} eq "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|'| + : $form->{fromdate} eq "" && $form->{todate} ne "" ? qq| AND st.itime::date <= '| . $form->{todate} . qq|'| : "" ; $restriction .= diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html index 8bc24a39a..8f8b130af 100644 --- a/templates/webpages/common/search_history_de.html +++ b/templates/webpages/common/search_history_de.html @@ -55,11 +55,11 @@ var jscalender = "" + "" + "
Zeitraum: 
von: " - + "" - + "" + + "" + + "" + " bis: " - + "" - + "
"; + + "" + + ""; var mitarbeiter = "" + "" + "" @@ -79,7 +79,7 @@ Calendar.setup( { - inputField : "transdate", + inputField : "fromdate", ifFormat :"%d.%m.%Y", align : "BL", button : "trigger1" @@ -87,7 +87,7 @@ Calendar.setup( { - inputField : "reqdate", + inputField : "todate", ifFormat :"%d.%m.%Y", align : "BL", button : "trigger2" @@ -172,8 +172,8 @@
Mitarbeiter: 
- - + + diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html index 6aa176fbb..2bcd7601c 100644 --- a/templates/webpages/common/search_history_master.html +++ b/templates/webpages/common/search_history_master.html @@ -55,11 +55,11 @@ var jscalender = "" + "" + "
Period
from (time): " - + "" - + "" + + "" + + "" + " to (time): " - + "" - + "
"; + + "" + + "
"; var mitarbeiter = "" + "" + "" @@ -79,7 +79,7 @@ Calendar.setup( { - inputField : "transdate", + inputField : "fromdate", ifFormat :"%d.%m.%Y", align : "BL", button : "trigger1" @@ -87,7 +87,7 @@ Calendar.setup( { - inputField : "reqdate", + inputField : "todate", ifFormat :"%d.%m.%Y", align : "BL", button : "trigger2" @@ -172,8 +172,8 @@
Mitarbeiter: 
- - + + -- 2.20.1