all functions complete

-- pre-polish check point
This commit is contained in:
David Delikat 2009-03-24 21:13:13 +00:00
parent efbe79e365
commit e0ef9d3c6e
2 changed files with 15 additions and 29 deletions

View file

@ -81,11 +81,11 @@ Deletes this ad.
sub delete { sub delete {
my $self = shift; my $self = shift;
my $iterator = WebGUI::AssetCollateral::Sku::Ad::Ad->getAllIterator($session,{ my $iterator = WebGUI::AssetCollateral::Sku::Ad::Ad->getAllIterator($self->session,{
constraints => [ { "adSkuPurchase.adId = ?" => $self->getId } ], constraints => [ { "adSkuPurchase.adId = ?" => $self->getId } ],
}); });
while( my $object = $iterator->() ) { while( my $object = $iterator->() ) {
$object->update('isDeleted' => 1); $object->update({'isDeleted' => 1});
} }
my $storage = WebGUI::Storage->get($self->session, $self->get("storageId")); my $storage = WebGUI::Storage->get($self->session, $self->get("storageId"));
$storage->delete if defined $storage; $storage->delete if defined $storage;

View file

@ -273,25 +273,15 @@ sub manage {
}); });
my %ads; my %ads;
while( my $object = $iterator->() ) { while( my $object = $iterator->() ) {
next if $object->get('isDeleted');
next if exists $ads{$object->get('adId')}; next if exists $ads{$object->get('adId')};
my $ad = $ads{$object->get('adId')} = WebGUI::AdSpace::Ad->new($session,$object->get('adId')); my $ad = $ads{$object->get('adId')} = WebGUI::AdSpace::Ad->new($session,$object->get('adId'));
if( $object->get('isDeleted') ) { push @{$var{myAds}}, {
push @{$var{myAds}}, { rowTitle => $ad->get('title'),
rowTitle => '', rowClicks => $ad->get('clicks') . '/' . $ad->get('clicksBought'),
rowClicks => '0/0', rowImpressions => $ad->get('impressions') . '/' . $ad->get('impressionsBought'),
rowImpressions => '0/0', rowRenewLink => $self->getUrl('func=renew;Id=' . $object->get('adSkuPurchaseId') ),
rowDeleted => 1, };
rowRenewLink => '',
};
} else {
push @{$var{myAds}}, {
rowTitle => $ad->get('title'),
rowClicks => $ad->get('clicks') . '/' . $ad->get('clicksBought'),
rowImpressions => $ad->get('impressions') . '/' . $ad->get('impressionsBought'),
rowDeleted => 0,
rowRenewLink => $self->getUrl('func=renew;Id=' . $object->get('adSkuPurchaseId') ),
};
}
} }
return $self->processTemplate(\%var,undef,$self->{_viewTemplate}); return $self->processTemplate(\%var,undef,$self->{_viewTemplate});
} }
@ -516,23 +506,19 @@ sub www_addToCart {
if ($self->canView) { if ($self->canView) {
$self->{_hasAddedToCart} = 1; $self->{_hasAddedToCart} = 1;
my $form = $self->session->form; my $form = $self->session->form;
my $imageStorage = WebGUI::Storage->create( $self->session); # LATER should be createTemp my $imageStorage = $self->getOptions->{image} || WebGUI::Storage->create($self->session); # LATER should be createTemp
my $imageStorageId = $form->process('formImage', 'image', $imageStorage->getId); my $imageStorageId = $form->process('formImage', 'image', $imageStorage->getId);
# TODO error in case image does not upload # TODO error in case image does not upload
dav::log 'addToCart:data:', my $cartInfo = {
'adtitle:' => $form->get('formTitle'),',', adtitle => $form->process('formTitle'),
'link:' => $form->get('formLink','url'),',',
'image:' => $imageStorageId,',',
'clicks:' => $form->get('formClicks'),',',
'impressions:' => $form->get('formImpressions');
$self->addToCart({
adtitle => $form->get('formTitle'),
link => $form->process('formLink','url'), link => $form->process('formLink','url'),
clicks => $form->process('formClicks','integer'), clicks => $form->process('formClicks','integer'),
impressions => $form->process('formImpressions','integer'), impressions => $form->process('formImpressions','integer'),
adId => $form->process('formAdId'), adId => $form->process('formAdId'),
image => $imageStorageId, image => $imageStorageId,
}); };
dav::dump 'addToCart:data:', $cartInfo;
$self->addToCart($cartInfo);
} }
return $self->www_view; return $self->www_view;
} }