Item14311: empty date2 formfields are empty

... not 01 Jan 1970
foswiki · Jan 27, 2017 · 5d332da · 5d332da
1 parent 8fb199a
commit 5d332da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/data/System/MoreFormfieldsPlugin.txt b/data/System/MoreFormfieldsPlugin.txt
@@ -205,6 +205,7 @@ A user reference using JQSelect2Contrib for autocompletion.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  27 Jan 2017: | render empty =date2= formfields as an empty string, not 01 Jan 1970 |
 |  25 Jan 2017: | fixed =topic= formfield to properly store web dot topic values |
 |  16 Jan 2017: | replace <nop>MoreFormfieldsAjaxHelper with a template solution to be able to override it when required; \
                   fixes in =id= and =autofill= formfields; \

diff --git a/lib/Foswiki/Form/Date2.pm b/lib/Foswiki/Form/Date2.pm
@@ -28,7 +28,11 @@ sub renderForDisplay {
 
     my $epoch = Foswiki::Time::parseTime($value);
     $epoch = 0 unless defined $epoch;
-    $value = Foswiki::Time::formatTime($epoch, $Foswiki::cfg{DefaultDateFormat} || '$year/$mo/$day', 'gmtime');
+    if ($epoch) {
+      $value = Foswiki::Time::formatTime($epoch, $Foswiki::cfg{DefaultDateFormat} || '$year/$mo/$day', 'gmtime');
+    } else {
+      $value = '';
+    }
 
     return $this->SUPER::renderForDisplay($format, $value, $attrs);
 }

diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm b/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm
@@ -25,8 +25,8 @@ use Foswiki::Plugins ();
 
 use Error qw(:try);
 
-our $VERSION = '3.01';
-our $RELEASE = '25 Jan 2017';
+our $VERSION = '3.02';
+our $RELEASE = '27 Jan 2017';
 our $SHORTDESCRIPTION = 'Additional formfield types for %SYSTEMWEB%.DataForms';
 our $NO_PREFS_IN_TOPIC = 1;