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

Changed wobjects to inherit their start/end dates from their parent page.

Browse source
This commit is contained in:
JT Smith 2002-08-04 02:14:16 +00:00
parent fa1f4145c5
commit 6156e72fba
7 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -176,7 +176,7 @@ sub www_edit {
$f = WebGUI::HTMLForm->new;
%hash = (list => WebGUI::International::get(17,$namespace),
calendarMonth => WebGUI::International::get(18,$namespace),
calendarMonthSmall => WebGUI::International::get(74,$namespace);
calendarMonthSmall => WebGUI::International::get(74,$namespace));
$f->select("calendarLayout",\%hash,WebGUI::International::get(16,$namespace),[$_[0]->get("calendarLayout")]);
$f->integer("paginateAfter",WebGUI::International::get(19,$namespace),$paginateAfter);
$f->yesNo("proceed",WebGUI::International::get(21,$namespace),$proceed);

8
lib/WebGUI/Wobject/ExtraColumn.pm
View file

@ -12,6 +12,7 @@ package WebGUI::Wobject::ExtraColumn;
use strict;
use Tie::CPHash;
use WebGUI::DateTime;
use WebGUI::HTMLForm;
use WebGUI::Icon;
use WebGUI::International;
@ -63,7 +64,7 @@ sub www_copy {
#-------------------------------------------------------------------
sub www_edit {
my ($output, $f, $endDate, $width, $class, $spacer);
my ($output, $f, $endDate, $width, $class, $spacer,$startDate);
if (WebGUI::Privilege::canEditPage()) {
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
@ -75,7 +76,8 @@ sub www_edit {
$spacer = $_[0]->get("spacer");
}
$class = $_[0]->get("class") || "content";
$endDate = $_[0]->get("endDate") || (time()+315360000);
$startDate = $_[0]->get("startDate") || $session{page}{startDate};
$endDate = $_[0]->get("endDate") || $session{page}{endDate};
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new");
@ -85,7 +87,7 @@ sub www_edit {
$f->hidden("displayTitle",0);
$f->hidden("processMacros",0);
$f->hidden("templatePosition",0);
$f->date("startDate",WebGUI::International::get(497),$_[0]->get("startDate"));
$f->date("startDate",WebGUI::International::get(497),$startDate);
$f->date("endDate",WebGUI::International::get(498),$endDate);
$f->integer("spacer",WebGUI::International::get(3,$namespace),$spacer);
$f->integer("width",WebGUI::International::get(4,$namespace),$width);

8
lib/WebGUI/Wobject/WobjectProxy.pm
View file

@ -12,6 +12,7 @@ package WebGUI::Wobject::WobjectProxy;
use strict;
use Tie::CPHash;
use WebGUI::DateTime;
use WebGUI::HTMLForm;
use WebGUI::Icon;
use WebGUI::International;
@ -61,7 +62,7 @@ sub www_copy {
#-------------------------------------------------------------------
sub www_edit {
my ($output, $f, $endDate, $templatePosition,%wobjects, %page, %wobject, $a, $b);
my ($output, $f, $startDate, $endDate, $templatePosition,%wobjects, %page, %wobject, $a, $b);
tie %wobject, 'Tie::CPHash';
tie %page, 'Tie::CPHash';
tie %wobjects, 'Tie::IxHash';
@ -69,7 +70,8 @@ sub www_edit {
$output = helpIcon(1,$namespace);
$output .= '<h1>'.WebGUI::International::get(2,$namespace).'</h1>';
$templatePosition = $_[0]->get("templatePosition") || '0';
$endDate = $_[0]->get("endDate") || (time()+315360000);
$startDate = $_[0]->get("startDate") || $session{page}{startDate};
$endDate = $_[0]->get("endDate") || $session{page}{endDate};
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$_[0]->get("wobjectId"));
$f->hidden("namespace",$_[0]->get("namespace")) if ($_[0]->get("wobjectId") eq "new");
@ -79,7 +81,7 @@ sub www_edit {
$f->hidden("displayTitle",0);
$f->hidden("processMacros",0);
$f->select("templatePosition",WebGUI::Template::getPositions($session{page}{templateId}),WebGUI::International::get(363),[$templatePosition]);
$f->date("startDate",WebGUI::International::get(497),$_[0]->get("startDate"));
$f->date("startDate",WebGUI::International::get(497),$startDate);
$f->date("endDate",WebGUI::International::get(498),$endDate);
$a = WebGUI::SQL->read("select pageId,menuTitle from page where pageId<2 or pageId>25 order by title");
while (%page = $a->hash) {