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

Better handling for collateral assets in the Product sku. Fixes bug #12072.

Browse source
This commit is contained in:
Colin Kuskie 2011-03-07 21:17:23 -08:00
parent 6ac8c49c87
commit dae7a145eb
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
7.10.12 7.10.12
- fixed #12072: Product, related and accessory assets
7.10.11 7.10.11
- fixed #12057: WebGUI::Search, assetIds search clause - fixed #12057: WebGUI::Search, assetIds search clause

32
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -1796,34 +1796,42 @@ sub view {
$var{'addaccessory_url'} = $self->getUrl('func=addAccessory'); $var{'addaccessory_url'} = $self->getUrl('func=addAccessory');
$var{'addaccessory_label'} = $i18n->get(36); $var{'addaccessory_label'} = $i18n->get(36);
##Need an id for collateral operations, and an assetId for asset instantiation. ##Need an id for collateral operations, and an assetId for asset instantiation.
foreach my $collateral ( @{ $self->getAllCollateral('accessoryJSON') } ) { ACCESSORY: foreach my $collateral ( @{ $self->getAllCollateral('accessoryJSON') } ) {
my $id = $collateral->{accessoryAssetId}; my $id = $collateral->{accessoryAssetId};
$segment = $self->session->icon->delete('func=deleteAccessoryConfirm&aid='.$id,$self->get('url'),$i18n->get(2)) $segment = $self->session->icon->delete('func=deleteAccessoryConfirm&aid='.$id,$self->get('url'),$i18n->get(2))
. $self->session->icon->moveUp('func=moveAccessoryUp&aid='.$id,$self->get('url')) . $self->session->icon->moveUp('func=moveAccessoryUp&aid='.$id,$self->get('url'))
. $self->session->icon->moveDown('func=moveAccessoryDown&aid='.$id,$self->get('url')); . $self->session->icon->moveDown('func=moveAccessoryDown&aid='.$id,$self->get('url'));
my $accessory_vars = {
accessory_title => $i18n->get('Lost'),
accessory_controls => $segment,
};
my $accessory = WebGUI::Asset->newByDynamicClass($session, $collateral->{accessoryAssetId}); my $accessory = WebGUI::Asset->newByDynamicClass($session, $collateral->{accessoryAssetId});
push(@accessoryloop,{ if ( $accessory ) {
'accessory_URL' => $accessory->getUrl, $accessory_vars->{ accessory_URL } = $accessory->getUrl;
'accessory_title' => $accessory->getTitle, $accessory_vars->{ accessory_title } = $accessory->getTitle;
'accessory_controls' => $segment, }
}); push(@accessoryloop, $accessory_vars);
} }
$var{accessory_loop} = \@accessoryloop; $var{accessory_loop} = \@accessoryloop;
#---related #---related
$var{'addrelatedproduct_url'} = $self->getUrl('func=addRelated'); $var{'addrelatedproduct_url'} = $self->getUrl('func=addRelated');
$var{'addrelatedproduct_label'} = $i18n->get(37); $var{'addrelatedproduct_label'} = $i18n->get(37);
foreach my $collateral ( @{ $self->getAllCollateral('relatedJSON')} ) { RELATED: foreach my $collateral ( @{ $self->getAllCollateral('relatedJSON')} ) {
my $id = $collateral->{relatedAssetId}; my $id = $collateral->{relatedAssetId};
$segment = $self->session->icon->delete('func=deleteRelatedConfirm&rid='.$id, $self->get('url'),$i18n->get(4)) $segment = $self->session->icon->delete('func=deleteRelatedConfirm&rid='.$id, $self->get('url'),$i18n->get(4))
. $self->session->icon->moveUp('func=moveRelatedUp&rid='.$id, $self->get('url')) . $self->session->icon->moveUp('func=moveRelatedUp&rid='.$id, $self->get('url'))
. $self->session->icon->moveDown('func=moveRelatedDown&rid='.$id, $self->get('url')); . $self->session->icon->moveDown('func=moveRelatedDown&rid='.$id, $self->get('url'));
my $related_vars = {
relatedproduct_title => $i18n->get('Lost'),
relatedproduct_controls => $segment,
};
my $related = WebGUI::Asset->newByDynamicClass($session, $collateral->{relatedAssetId}); my $related = WebGUI::Asset->newByDynamicClass($session, $collateral->{relatedAssetId});
push(@relatedloop,{ if ($related) {
'relatedproduct_URL' => $related->getUrl, $related_vars->{ relatedproduct_URL } = $related->getUrl;
'relatedproduct_title' => $related->getTitle, $related_vars->{ relatedproduct_title } = $related->getTitle;
'relatedproduct_controls' => $segment, }
}); push(@relatedloop, $related_vars);
} }
$var{relatedproduct_loop} = \@relatedloop; $var{relatedproduct_loop} = \@relatedloop;

6
lib/WebGUI/i18n/English/Asset_Product.pm
View file

@ -864,6 +864,12 @@ be useful, others may not.|,
context => q|A set of links or icons to edit or alter the object.| context => q|A set of links or icons to edit or alter the object.|
}, },
'Lost' => {
message => q|Asset lost|,
lastUpdated => 0,
context => q|A message indicating that the asset used by the Product as collateral has been lost. Lost as in missing/deleted.|
},
}; };
1; 1;