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

fix EMS bug pertaining to use of getUrl and session->icon

Browse source
This commit is contained in:
Colin Kuskie 2007-02-14 06:14:37 +00:00
parent 1b02f3f8a7
commit 8baac2160b
4 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -69,6 +69,7 @@
- fix: Home macro fails when company name has comma (perlDreamer Consulting, LLC)
- fix: WSClient pagination variables. (DonorWare and perlDreamer Consulting, LLC)
- fix: Add to Group Documentation (perlDreamer Consulting, LLC)
- fix: EMS url issues (Demo only) (perlDreamer Consulting, LLC)
7.3.8
- Fixed a template variable rewriting problem with HTML::Template::Expr

4
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -399,9 +399,9 @@ sub getListTemplateVars {
push(@recordLoop,{
"record.ipAddress"=>$record->{ipAddress},
"record.edit.url"=>$self->getFormUrl("func=view;entryId=".$record->{DataForm_entryId}),
"record.edit.icon"=>$self->session->icon->edit("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
"record.edit.icon"=>$self->session->icon->edit("func=view;entryId=".$record->{DataForm_entryId}, $self->get('url')),
"record.delete.url"=>$self->getUrl("func=deleteEntry;entryId=".$record->{DataForm_entryId}),
"record.delete.icon"=>$self->session->icon->delete("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, $i18n->get('Delete entry confirmation')),
"record.delete.icon"=>$self->session->icon->delete("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->get('url'), $i18n->get('Delete entry confirmation')),
"record.username"=>$record->{username},
"record.userId"=>$record->{userId},
"record.submissionDate.epoch"=>$record->{submissionDate},

32
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -1449,8 +1449,8 @@ sub addCartVars {
$purchase->{newPrice} += $_->{price};
}
}
$purchase->{editIcon} = $self->session->icon->edit("func=addEventsToBadge;bid=".$purchase->{badgeId}.";purchaseCounter=".$i, $self->getUrl());
$purchase->{deleteIcon} = $self->session->icon->delete("func=addEventsToBadge;bid=none;purchaseCounter=".$i,$self->getUrl,$i18n->get('confirm delete purchase'));
$purchase->{editIcon} = $self->session->icon->edit("func=addEventsToBadge;bid=".$purchase->{badgeId}.";purchaseCounter=".$i, $self->get('url')());
$purchase->{deleteIcon} = $self->session->icon->delete("func=addEventsToBadge;bid=none;purchaseCounter=".$i,$self->get('url'),$i18n->get('confirm delete purchase'));
$purchase->{'edit.url'} = $self->getUrl("func=addEventsToBadge;bid=".$purchase->{badgeId}.";purchaseCounter=".$i);
$purchase->{'delete.url'} = $self->getUrl("func=addEventsToBadge;bid=none;purchaseCounter=".$i);
push(@{$var->{'cart.purchaseLoop'}},$purchase);
@ -1947,10 +1947,10 @@ sub www_manageEventMetadata {
my %row = %{$row1};
$count++;
$output .= "<div>".
$self->session->icon->delete('func=deleteEventMetaDataField;fieldId='.$row{fieldId},$self->getUrl,$i18n->get('confirm delete event metadata')).
$self->session->icon->edit('func=editEventMetaDataField;fieldId='.$row{fieldId}, $self->getUrl).
$self->session->icon->moveUp('func=moveEventMetaDataFieldUp;fieldId='.$row{fieldId}, $self->getUrl,($count == 1)?1:0);
$output .= $self->session->icon->moveDown('func=moveEventMetaDataFieldDown;fieldId='.$row{fieldId}, $self->getUrl,($count == $number)?1:0).
$self->session->icon->delete('func=deleteEventMetaDataField;fieldId='.$row{fieldId},$self->get('url'),$i18n->get('confirm delete event metadata')).
$self->session->icon->edit('func=editEventMetaDataField;fieldId='.$row{fieldId}, $self->get('url')).
$self->session->icon->moveUp('func=moveEventMetaDataFieldUp;fieldId='.$row{fieldId}, $self->get('url'),($count == 1)?1:0);
$output .= $self->session->icon->moveDown('func=moveEventMetaDataFieldDown;fieldId='.$row{fieldId}, $self->get('url'),($count == $number)?1:0).
" ".$row{name}." ( ".$row{label}." )</div>";
}
} else {
@ -3047,11 +3047,11 @@ sub www_search {
$eventFields{'eventIsCanceled'} = ($event->{'approved'} eq "-2");
$eventFields{'eventIsDenied'} = ($event->{'approved'} eq "0");
$eventFields{'eventState.label'} = $self->getEventStateLabel($event->{approved});
$eventFields{'manageToolbar'} = $self->session->icon->delete('func=deleteEvent;pid='.$event->{productId}, $self->getUrl,
$eventFields{'manageToolbar'} = $self->session->icon->delete('func=deleteEvent;pid='.$event->{productId}, $self->get('url'),
$i18n->get('confirm delete event')).
$self->session->icon->edit('func=editEvent;pid='.$event->{productId}, $self->getUrl).
$self->session->icon->moveUp('func=moveEventUp;pid='.$event->{productId}, $self->getUrl).
$self->session->icon->moveDown('func=moveEventDown;pid='.$event->{productId}, $self->getUrl);
$self->session->icon->edit('func=editEvent;pid='.$event->{productId}, $self->get('url')).
$self->session->icon->moveUp('func=moveEventUp;pid='.$event->{productId}, $self->get('url')).
$self->session->icon->moveDown('func=moveEventDown;pid='.$event->{productId}, $self->get('url'));
if ($eventFields{'eventIsFull'}) {
$eventFields{'purchase.label'} = $i18n->get('sold out');
@ -3234,9 +3234,9 @@ sub www_managePrereqSets {
while (my %row = $sth->hash) {
$output .= "<div>";
$output .= $self->session->icon->delete('func=deletePrereqSet;psid='.$row{prerequisiteId}, $self->getUrl,
$output .= $self->session->icon->delete('func=deletePrereqSet;psid='.$row{prerequisiteId}, $self->get('url'),
$i18n->get('confirm delete prerequisite set')).
$self->session->icon->edit('func=editPrereqSet;psid='.$row{prerequisiteId}, $self->getUrl).
$self->session->icon->edit('func=editPrereqSet;psid='.$row{prerequisiteId}, $self->get('url')).
" ".$row{name}."</div>";
}
} else {
@ -3368,8 +3368,8 @@ sub www_manageRegistrants {
$p->setAlphabeticalKey('lastName');
foreach (@$data) {
$output .= "<div>";
# $output .= $self->session->icon->delete('func=deleteRegistrant;psid='.$_->{badgeId}, $self->getUrl);
$output .= $self->session->icon->edit('func=editRegistrant;badgeId='.$_->{badgeId}, $self->getUrl).
# $output .= $self->session->icon->delete('func=deleteRegistrant;psid='.$_->{badgeId}, $self->get('url'));
$output .= $self->session->icon->edit('func=editRegistrant;badgeId='.$_->{badgeId}, $self->get('url')).
"&nbsp;&nbsp;".$_->{lastName}.",&nbsp;".$_->{firstName}."&nbsp;&nbsp;(&nbsp;".$_->{email}."&nbsp;)</div>";
}
$output .= '<div>'.$p->getBarAdvanced.'</div>';
@ -3618,8 +3618,8 @@ sub www_manageDiscountPasses {
if ($sth->rows) {
while (my $data = $sth->hashRef) {
$output .= "<div>";
# $output .= $self->session->icon->delete('func=deleteDiscountPass;psid='.$data->{passId}, $self->getUrl);
$output .= $self->session->icon->edit('func=editDiscountPass;passId='.$data->{passId}, $self->getUrl).
# $output .= $self->session->icon->delete('func=deleteDiscountPass;psid='.$data->{passId}, $self->get('url'));
$output .= $self->session->icon->edit('func=editDiscountPass;passId='.$data->{passId}, $self->get('url')).
"&nbsp;&nbsp;".$data->{name}."&nbsp;&nbsp;(".$data->{type}."&nbsp;".$data->{amount}."&nbsp;)</div>";
}
}

4
lib/WebGUI/Asset/Wobject/SQLForm.pm
View file

@ -3020,7 +3020,7 @@ my $assetsUsing = $self->session->db->read(
' t1.property="fieldType" and t1.value='.$self->session->db->quote($row->{fieldTypeId}));
my $currentRow = '<tr align="left" bgcolor="#bbbbbb">';
$currentRow .= "<td>";
$currentRow .= $self->session->icon->delete('func=deleteFieldType;ftid='.$row->{fieldTypeId}, $self->getUrl, $i18n->get('lft delete confirm message')) unless ($assetsUsing->rows);
$currentRow .= $self->session->icon->delete('func=deleteFieldType;ftid='.$row->{fieldTypeId}, $self->get('url'), $i18n->get('lft delete confirm message')) unless ($assetsUsing->rows);
$currentRow .= "</td>";
$currentRow .= "<td>".$row->{dbFieldType}."</td><td>".$row->{formFieldType}."</td>";
@ -3098,7 +3098,7 @@ my $assetsUsing = $self->session->db->read(
' t1.property="regex" and t1.value='.$self->session->db->quote($row->{regexId}));
my $currentRow = '<tr align="left" bgcolor="#bbbbbb">';
$currentRow .= "<td>";
$currentRow .= $self->session->icon->delete('func=deleteRegex;regexId='.$row->{regexId}, $self->getUrl, 'Are you sure?') unless ($assetsUsing->rows);
$currentRow .= $self->session->icon->delete('func=deleteRegex;regexId='.$row->{regexId}, $self->get('url'), 'Are you sure?') unless ($assetsUsing->rows);
$currentRow .= "</td>";
$currentRow .= "<td>".$row->{name}."</td><td>".$row->{regex}."</td>";