oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added time field to start and end dates on pages and wobjects.

Browse source
This commit is contained in:
JT Smith 2003-05-24 16:27:34 +00:00
parent da7d400c82
commit c645a1908f
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI.pm
View file

@ -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}) {

2
lib/WebGUI/Form.pm
View file

@ -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.'.

9
lib/WebGUI/Operation/Page.pm
View file

@ -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},

8
lib/WebGUI/Wobject.pm
View file

@ -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,