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

Fixed a number of Matrix datatable problems.

Browse source
This commit is contained in:
Yung Han Khoe 2008-11-21 02:53:53 +00:00
parent 19b8a90139
commit 36d4013dff
5 changed files with 174 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

73
lib/WebGUI/Asset/MatrixListing.pm
View file

@ -480,6 +480,31 @@ sub view {
$var->{manufacturerUrl_click} = $self->getUrl("func=click;manufacturer=1");
$var->{productUrl_click} = $self->getUrl("func=click");
$self->session->style->setScript($self->session->url->extras('yui/build/yahoo/yahoo-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/json/json-min.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/connection/connection-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/get/get-min.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/element/element-beta-min.js'), {type =>
'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datasource/datasource-min.js'),
{type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/datatable/datatable-min.js'),
{type =>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'),
{type =>'text/javascript'});
$self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrixListing.js'), {type =>
'text/javascript'});
$self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'),
{type =>'text/css', rel=>'stylesheet'});
# Attributes
foreach my $category (@categories) {
@ -713,6 +738,54 @@ sub www_edit {
#-------------------------------------------------------------------
=head2 www_getAttributes ( )
Gets a listings attributes grouped by category as json.
=cut
sub www_getAttributes {
my $self = shift;
my $session = $self->session;
my $db = $session->db;
return $session->privilege->noAccess() unless $self->canView;
$session->http->setMimeType("application/json");
my @results;
my @categories = keys %{$self->getParent->getCategories};
foreach my $category (@categories) {
my $attributes;
my @attribute_loop;
#my $categoryLoopName = $self->session->url->urlize($category)."_loop";
$attributes = $db->read("select * from Matrix_attribute as a
left join MatrixListing_attribute as l on (a.attributeId = l.attributeId and l.matrixListingId = ?)
where category =? and a.assetId = ?",
[$self->getId,$category,$self->getParent->getId]);
while (my $attribute = $attributes->hashRef) {
$attribute->{label} = $attribute->{name};
$attribute->{attributeId} =~ s/-/_____/g;
if ($attribute->{fieldType} eq 'MatrixCompare'){
$attribute->{value} = WebGUI::Form::MatrixCompare->new($self->session,$attribute)->getValueAsHtml;
}
push(@results,$attribute);
}
#$var->{$categoryLoopName} = \@attribute_loop;
#push(@{$var->{category_loop}},{
# categoryLabel => $category,
# attribute_loop => \@attribute_loop,
#});
}
my $jsonOutput;
$jsonOutput->{ResultSet} = {Result=>\@results};
return JSON->new->utf8->encode($jsonOutput);
}
#-------------------------------------------------------------------
=head2 www_getScreenshots ( )
Returns the screenshots as xml.

7
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -620,7 +620,7 @@ sub www_compare {
my $self = shift;
my $var = $self->get;
my @listingIds = @_;
my @columnKeys;
my @responseFields;
unless (scalar(@listingIds)) {
@listingIds = $self->session->form->checkList("listingId");
@ -664,13 +664,12 @@ sub www_compare {
foreach my $listingId (@listingIds){
my $listingId_safe = $listingId;
$listingId_safe =~ s/-/_____/g;
push(@columnKeys, $listingId_safe);
push(@columnKeys, $listingId_safe."_compareColor");
push(@responseFields, $listingId_safe, $listingId_safe."_compareColor");
}
$var->{javascript} = "<script type='text/javascript'>\n".
'var listingIds = new Array('.join(", ",map {'"'.$_.'"'} @listingIds).");\n".
'var columnKeys = new Array("attributeId", "name", '.join(", ",map {'"'.$_.'"'} @columnKeys).");\n".
'var responseFields = new Array("attributeId", "name", '.join(", ",map {'"'.$_.'"'} @responseFields).");\n".
"var maxComparisons = ".$maxComparisons.";\n".
"</script>";