From c645a1908f87c306cf630ffee33447a4d4a5b6ee Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 24 May 2003 16:27:34 +0000
Subject: [PATCH] Added time field to start and end dates on pages and
 wobjects.

---
 lib/WebGUI.pm                | 5 +++--
 lib/WebGUI/Form.pm           | 2 +-
 lib/WebGUI/Operation/Page.pm | 9 +++++----
 lib/WebGUI/Wobject.pm        | 8 ++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 29dc1abef..e5606dcee 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -76,12 +76,13 @@ sub _generatePage {
                         }
                         if (${$wobject}{namespace} eq "WobjectProxy") {
                                 $originalWobject = $wobject;
-                                my ($wobjectProxy) = WebGUI::SQL->quickHashRef("select * from WobjectProxy 
-					where wobjectId=".${$wobject}{wobjectId});
+                                my ($wobjectProxy) = WebGUI::SQL->quickHashRef("select * from WobjectProxy where wobjectId=".${$wobject}{wobjectId});
                                 $wobject = WebGUI::SQL->quickHashRef("select * from wobject where wobject.wobjectId=".$wobjectProxy->{proxiedWobjectId});
                                 if (${$wobject}{namespace} eq "") {
                                         $wobject = $originalWobject;
                                 } else {
+                                        ${$wobject}{startDate} = ${$originalWobject}{startDate};
+                                        ${$wobject}{endDate} = ${$originalWobject}{endDate};
                                         ${$wobject}{templatePosition} = ${$originalWobject}{templatePosition};
                                         ${$wobject}{_WobjectProxy} = ${$originalWobject}{wobjectId};
 					if ($wobjectProxy->{overrideTitle}) {
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index 0167ffff1..e96a60a46 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -298,7 +298,7 @@ sub date {
 		name=>$_[0]->{name},
 		value=>$value,
 		size=>$size,
-		extras=>'onKeyUp="doInputCheck(this.form.'.$_[0]->{name}.',\'0123456789\')" '.$_[0]->{extras},
+		extras=>'onKeyUp="doInputCheck(this.form.'.$_[0]->{name}.',\'0123456789/\')" '.$_[0]->{extras},
 		maxlength=>10
 		});
 	$output .= '<input type="button" style="font-size: 8pt;" onClick="window.dateField = this.form.'.
diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 6f7df858b..33cbd484e 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -13,6 +13,7 @@ package WebGUI::Operation::Page;
 use Exporter;
 use strict;
 use WebGUI::DateTime;
+use WebGUI::FormProcessor;
 use WebGUI::Grouping;
 use WebGUI::HTMLForm;
 use WebGUI::Icon;
@@ -356,13 +357,13 @@ sub www_editPage {
                         -label=>WebGUI::International::get(356),
                         -uiLevel=>5
                         );
-        	$f->getTab("privileges")->date(
+        	$f->getTab("privileges")->dateTime(
 			-name=>"startDate",
 			-label=>WebGUI::International::get(497),
 			-value=>$page{startDate},
 			-uiLevel=>6
 			);
-        	$f->getTab("privileges")->date(
+        	$f->getTab("privileges")->dateTime(
 			-name=>"endDate",
 			-label=>WebGUI::International::get(498),
 			-value=>$page{endDate},
@@ -456,8 +457,8 @@ sub www_editPageSave {
         $session{form}{menuTitle} = $session{form}{title} if ($session{form}{menuTitle} eq "");
         $session{form}{urlizedTitle} = $session{form}{menuTitle} if ($session{form}{urlizedTitle} eq "");
 	$session{form}{urlizedTitle} = WebGUI::Page::makeUnique(WebGUI::URL::urlize($session{form}{urlizedTitle}),$session{form}{pageId});
-	$session{form}{startDate} = setToEpoch($session{form}{startDate}) || setToEpoch(time());
-       	$session{form}{endDate} = setToEpoch($session{form}{endDate}) || setToEpoch(addToDate(time(),10));
+	$session{form}{startDate} = WebGUI::FormProcessor::dateTime("startDate");
+	$session{form}{endDate} = WebGUI::FormProcessor::dateTime("endDate");
         WebGUI::SQL->write("update page set 
 		title=".quote($session{form}{title}).", 
 		styleId=$session{form}{styleId}, 
diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index c8621b808..eca7f914f 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -730,11 +730,11 @@ sub new {
 			}, 
 		startDate=>{
 			defaultValue=>$session{page}{startDate},
-			fieldType=>"date"
+			fieldType=>"dateTime"
 			},
 		endDate=>{
 			defaultValue=>$session{page}{endDate},
-			fieldType=>"date"
+			fieldType=>"dateTime"
 			},
 		sequenceNumber=>{
 			fieldType=>"hidden"
@@ -1357,13 +1357,13 @@ sub www_edit {
 		-options=>WebGUI::Page::getTemplatePositions($session{page}{templateId}),
 		-subtext=>WebGUI::Page::drawTemplate($session{page}{templateId})
 		);
-	$f->getTab("privileges")->date(
+	$f->getTab("privileges")->dateTime(
 		-name=>"startDate",
 		-label=>WebGUI::International::get(497),
 		-value=>$startDate,
 		-uiLevel=>6
 		);
-	$f->getTab("privileges")->date(
+	$f->getTab("privileges")->dateTime(
 		-name=>"endDate",
 		-label=>WebGUI::International::get(498),
 		-value=>$endDate,