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

fix: Calendar Event Details template now uses dateSpan friendly variable

Browse source
This commit is contained in:
Doug Bell 2007-02-01 21:27:31 +00:00
parent 42d489fa39
commit 16ad4f3f16
4 changed files with 222 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/WebGUI/Asset/Event.pm
View file

@ -131,24 +131,6 @@ sub definition {
####################################################################
=head2 canAdd
Returns true if a user can add this asset.
=cut
sub canAdd {
my $self = shift;
my $session = shift;
return $session->user->isInGroup($self->getParent->get("groupIdEventEdit"));
}
####################################################################
@ -190,6 +172,7 @@ sub generateRecurringEvents {
my $self = shift;
my $recur = shift;
my $parent = $self->getParent;
my $session = $self->session;
my $id;
if ($recur) {
@ -221,12 +204,20 @@ sub generateRecurringEvents {
for my $date (@dates) {
my $dt = WebGUI::DateTime->new($self->session, $date." 00:00:00");
### TODO: Only generate if the recurId does not exist on this day
$properties->{startDate} = $dt->strftime('%F');
$properties->{endDate} = $dt->clone->add(days => $duration_days)->strftime('%F');
my $newEvent = $parent->addChild($properties);
$newEvent->requestAutoCommit;
# Only generate if the recurId does not exist on this day
my ($exists)
= $session->db->buildArray(
"select count(*) from Event where recurId=? and startDate=?",
[$properties->{recurId}, $properties->{startDate}],
);
if (!$exists) {
my $newEvent = $parent->addChild($properties);
$newEvent->requestAutoCommit;
}
}
return 1;

2
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -258,7 +258,7 @@ sub addChild {
$self->session->errorHandler->security("add a ".$properties->{className}." to a ".$self->get("className"));
return undef;
}
use Carp qw(cluck); use Data::Dumper; cluck Dumper $self;
return $self->SUPER::addChild($properties, @other);
}