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

bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-17 20:13:01 +00:00
parent c7c2c8d178
commit 736d341312
10 changed files with 148 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -88,13 +88,6 @@ sub definition {
#-------------------------------------------------------------------
sub duplicate {
my $self = shift;
return $self->getParent->duplicateTree($self);
}
#-------------------------------------------------------------------
sub getEditForm {
@ -308,8 +301,8 @@ sub view {
foreach my $event (@{$children}) {
if (ref $event eq "WebGUI::Asset::Event") {
my $eventStartDate = $event->getValue("eventStartDate");
my $eventEndDate = $event->getValue("eventEndDate");
my $eventStartDate = $event->get("eventStartDate");
my $eventEndDate = $event->get("eventEndDate");
if ($eventStartDate > $eventEndDate) {
#Fix bad data. Everything that has a beginning must have an end [no earlier than its beginning].
$event->update({ "eventEndDate"=>$eventStartDate });
@ -348,8 +341,8 @@ sub view {
#Now also test to see if we're at the maxDate yet and after the minDate.
if (($date[1] == $thisMonthDate[1]) && (WebGUI::DateTime::addToDate($eventStartDate,0,0,$i) <= ($maxDate + 2678400))){
push(@{$events{$date[2]}}, {
description=>$event->getValue("description"),
name=>$event->getValue("title"),
description=>$event->get("description"),
name=>$event->get("title"),
'start.date.human'=>$startDate,
'start.time.human'=>$startTime." ".$startAmPm,
'start.date.epoch'=>$eventStartDate,

26
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -15,6 +15,7 @@ use Tie::IxHash;
use WebGUI::Asset::Wobject;
use WebGUI::ErrorHandler;
use WebGUI::Form;
use WebGUI::Icon;
use WebGUI::International;
use WebGUI::Privilege;
use WebGUI::Session;
@ -27,6 +28,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
#-------------------------------------------------------------------
sub definition {
my $class = shift;
my $definition = shift;
@ -71,6 +73,7 @@ sub definition {
return $class->SUPER::definition($definition);
}
#-------------------------------------------------------------------
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm;
@ -211,6 +214,7 @@ sub getEditForm {
return $tabform;
}
#-------------------------------------------------------------------
sub getIcon {
my $self = shift;
my $small = shift;
@ -218,11 +222,32 @@ sub getIcon {
return $session{config}{extrasURL}.'/assets/navigation.gif';
}
#-------------------------------------------------------------------
sub getName {
return WebGUI::International::get("navigation","Navigation");
}
#-------------------------------------------------------------------
=head2 getToolbar ( )
Returns a toolbar with a set of icons that hyperlink to functions that delete, edit, promote, demote, cut, and copy.
=cut
sub getToolbar {
my $self = shift;
if ($self->getToolbarState) {
my $toolbar = editIcon('func=edit',$self->get("url"));
return '<img src="'.$self->getIcon(1).'" border="0" title="'.$self->getName.'" alt="'.$self->getName.'" align="absmiddle">'.$toolbar;
}
return $self->SUPER::getToolbar();
}
#-------------------------------------------------------------------
sub view {
my $self = shift;
# we've got to determine what our start point is based upon user conditions
@ -354,6 +379,7 @@ sub view {
}
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;