diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 28e42accf..90553ab52 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -38,6 +38,7 @@
- rfe: Thingy can now copy thingy entries
- Added a switch to subscriptions so that they can be also non-recurring to
facilitate eg. limited time meberships (Martin Kamerbeek / Oqapi)
+ - Replaced Matrix with newer version
7.6.3
- improved performance of file uploads
diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
index 1a3135262..09f1f179c 100644
--- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl
+++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
@@ -41,8 +41,134 @@ removeProcessRecurringPaymentsFromConfig( $session );
addExtendedProfilePrivileges( $session );
addStorageUrlMacro( $session );
addRecurringSubscriptionSwitch( $session );
+upgradeMatrix( $session );
finish($session); # this line required
+#----------------------------------------------------------------------------
+sub upgradeMatrix {
+ my $session = shift;
+ print "\tUpgrading matrix assets... \n" unless $quiet;
+ my $db = $session->db;
+ $db->write("alter table Matrix drop column groupToRate, drop column groupToAdd, drop column privilegedGroup,
+ drop column ratingTimeout, drop column ratingTimeoutPrivileged, drop column ratingDetailTemplateId,
+ drop column visitorCacheTimeout");
+ $db->write("alter table Matrix add column defaultSort char(22) not null default 'score',
+ add column compareColorNo char(22) default '#ffaaaa',
+ add column compareColorLimited char(22) not null default '#ffffaa',
+ add column compareColorCostsExtra char(22) not null default '#ffffaa',
+ add column compareColorFreeAddOn char(22) not null default '#ffffaa',
+ add column compareColorYes char(22) not null default '#aaffaa',
+ add column submissionApprovalWorkflowId char(22) not null,
+ add column ratingsDuration int(11) not null default 7776000");
+ $db->write("create table MatrixListing (
+ assetId char(22) binary not null,
+ revisionDate bigint not null,
+ screenshots char(22),
+ description text,
+ version char(255),
+ views int(11),
+ compares int(11),
+ clicks int(11),
+ viewsLastIp char(255),
+ comparesLastIp char(255),
+ clicksLastIp char(255),
+ lastUpdated int(11),
+ maintainer char(22),
+ manufacturerName char(255),
+ manufacturerURL char(255),
+ productURL char(255),
+ score int(11),
+ primary key (assetId, revisionDate)
+ )");
+ $db->write("create table MatrixListing_attribute (
+ matrixId char(22) not null,
+ matrixListingId char(22) not null,
+ attributeId char(22) not null,
+ value char(255),
+ primary key (matrixId, matrixListingId, attributeId)
+ )");
+ $db->write("alter table Matrix_rating rename MatrixListing_rating");
+ $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary");
+ $db->write("alter table Matrix_field rename Matrix_attribute");
+ $db->write("alter table Matrix_attribute drop column label");
+ $db->write("alter table Matrix_attribute add column options text");
+ $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'");
+ $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");
+ $db->write("update Matrix_attribute set fieldType = 'MatrixCompare' where fieldType = 'GoodBad'");
+ $db->write("update Matrix_attribute set fieldType = 'Combo' where fieldType != 'MatrixCompare'");
+ $db->write("update Matrix_listingData set value = 0 where value = 'No'");
+ $db->write("update Matrix_listingData set value = 1 where value = 'Limited'");
+ $db->write("update Matrix_listingData set value = 2 where value = 'Costs Extra'");
+ $db->write("update Matrix_listingData set value = 3 where value = 'Free Add On'");
+ $db->write("update Matrix_listingData set value = 4 where value = 'Yes'");
+
+ # get existing Matrix wobjects
+ my $matrices = WebGUI::Asset->getRoot($session)->getLineage(['descendants'],
+ {
+ statesToInclude => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
+ statusToInclude => ['pending','approved','deleted','archived'],
+ includeOnlyClasses => ['WebGUI::Asset::Wobject::Matrix'],
+ returnObjects => 1,
+ });
+
+ for my $matrix (@{$matrices})
+ {
+ next unless defined $matrix;
+ # If the asset is in the trash, ignore the migration, we're just going
+ # to purge it.
+ if ($matrix->get("state") =~ m/trash/) {
+ $matrix->purge;
+ next;
+ }
+
+ # get listings for each Matrix
+ my @listings = @{ $db->buildArrayRefOfHashRefs("select * from Matrix_listing where assetId =?",[$matrix->getId]) };
+ foreach my $listing (@listings){
+ # add MatrixListing asset for each listing
+ print "Migrating listing: ".$listing->{productName}."\n" unless $quiet;;
+ $listing->{className} = 'WebGUI::Asset::MatrixListing';
+ $listing->{assetId} = 'new';
+ $listing->{title} = $listing->{productName};
+ $listing->{version} = $listing->{versionNumber};
+ $listing->{screenshots} = $listing->{storageId};
+ $listing->{productURL} = $listing->{productUrl};
+ $listing->{manufacturerURL} = $listing->{manufacturerUrl};
+ my $newMatrixListing = $matrix->addChild($listing,undef,undef,{skipAutoCommitWorkflows=>1});
+ # get listingData for each listing
+ my $listingData = $db->buildArrayRefOfHashRefs("select * from Matrix_listingData where listingId =?",[$listing->{listingId}]);
+ # add listing attribute for each listing field
+ foreach my $attribute (@{$listingData}){
+ $db->write("insert into MatrixListing_attribute (matrixId, matrixListingId, attributeId, value) values
+ (?,?,?,?)",[$matrix->getId,$newMatrixListing->getId,$attribute->{fieldId},$attribute->{value}]);
+ }
+ # update listingIds to MatrixListingIds in MatrixListing_rating/Summary tables
+ $db->write("update MatrixListing_rating set listingId = ? where listingId =?",
+ [$newMatrixListing->getId,$listing->{listingId}]);
+ $db->write("update MatrixListing_ratingSummary set listingId = ? where listingId =?",
+ [$newMatrixListing->getId,$listing->{listingId}]);
+ # migrate comments
+ if($listing->{forumId}){
+ my $forum = WebGUI::Asset::Wobject::Collaboration->new($session, $listing->{forumId});
+ my @comments = @{ $forum->getLineage(['descendants'], {
+ includeOnlyClasses => ["WebGUI::Asset::Post", "WebGUI::Asset::Post::Thread"],
+ returnObjects => 1,
+ }) };
+ foreach my $comment (@comments){
+ # add comment
+ my $content = $comment->get('content');
+ $content =~ s/^//;
+ $content =~ s/<\/p>//;
+ my $ownerUser = WebGUI::User->new($session,$comment->get('ownerUserId'));
+ $newMatrixListing->addComment($content,0,$ownerUser);
+ }
+ }
+ }
+ }
+ $db->write("drop table Matrix_listing");
+ $db->write("drop table Matrix_listingData");
+ print "DONE!\n" unless $quiet;
+}
+
#----------------------------------------------------------------------------
sub addExtendedProfilePrivileges {
my $session = shift;
diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
new file mode 100644
index 000000000..730a86086
--- /dev/null
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -0,0 +1,914 @@
+package WebGUI::Asset::MatrixListing;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+ WebGUI is Copyright 2001-2008 Plain Black Corporation.
+ -------------------------------------------------------------------
+ Please read the legal notices (docs/legal.txt) and the license
+ (docs/license.txt) that came with this distribution before using
+ this software.
+ -------------------------------------------------------------------
+ http://www.plainblack.com info@plainblack.com
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use Tie::IxHash;
+use Class::C3;
+use base qw(WebGUI::AssetAspect::Comments WebGUI::Asset);
+use WebGUI::Utility;
+
+
+
+=head1 NAME
+
+Package WebGUI::Asset::MatrixListing
+
+=head1 DESCRIPTION
+
+Describe your New Asset's functionality and features here.
+
+=head1 SYNOPSIS
+
+use WebGUI::Asset::MatrixListing;
+
+
+=head1 METHODS
+
+These methods are available from this class:
+
+=cut
+
+
+
+#-------------------------------------------------------------------
+
+=head2 addRevision
+
+ This method exists for demonstration purposes only. The superclass
+ handles revisions to MatrixListing Assets.
+
+=cut
+
+sub addRevision {
+ my $self = shift;
+ my $newSelf = $self->next::method(@_);
+ return $newSelf;
+}
+
+#-------------------------------------------------------------------
+
+=head2 definition ( session, definition )
+
+defines asset properties for MatrixListing instances.
+
+=head3 session
+
+=head3 definition
+
+A hash reference passed in from a subclass definition.
+
+=cut
+
+sub definition {
+ my $class = shift;
+ my $session = shift;
+ my $definition = shift;
+ my %properties;
+ tie %properties, 'Tie::IxHash';
+ my $i18n = WebGUI::International->new($session, "Asset_MatrixListing");
+ %properties = (
+ screenshots => {
+ tab =>"properties",
+ fieldType =>"image",
+ defaultValue =>undef,
+ maxAttachments =>20,
+ label =>$i18n->get("screenshots label"),
+ hoverHelp =>$i18n->get("screenshots description")
+ },
+ description => {
+ tab =>"properties",
+ fieldType =>"HTMLArea",
+ defaultValue =>undef,
+ label =>$i18n->get("description label"),
+ hoverHelp =>$i18n->get("description description")
+ },
+ version => {
+ tab =>"properties",
+ fieldType =>"text",
+ defaultValue =>undef,
+ label =>$i18n->get("version label"),
+ hoverHelp =>$i18n->get("version description")
+ },
+ score => {
+ defaultValue =>0,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ views => {
+ defaultValue =>0,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ compares => {
+ defaultValue =>0,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ clicks => {
+ defaultValue =>0,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ viewsLastIp => {
+ defaultValue =>undef,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ comparesLastIp => {
+ defaultValue =>undef,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ clicksLastIp => {
+ defaultValue =>undef,
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ maintainer => {
+ tab =>"properties",
+ fieldType =>"user",
+ defaultValue =>$session->user->userId,
+ label =>$i18n->get("maintainer label"),
+ hoverHelp =>$i18n->get("maintainer description")
+ },
+ manufacturerName => {
+ tab =>"properties",
+ fieldType =>"text",
+ defaultValue =>undef,
+ label =>$i18n->get("manufacturerName label"),
+ hoverHelp =>$i18n->get("manufacturerName description")
+ },
+ manufacturerURL => {
+ tab =>"properties",
+ fieldType =>"url",
+ defaultValue =>undef,
+ label =>$i18n->get("manufacturerURL label"),
+ hoverHelp =>$i18n->get("manufacturerURL description")
+ },
+ productURL => {
+ tab =>"properties",
+ fieldType =>"url",
+ defaultValue =>undef,
+ label =>$i18n->get("productURL label"),
+ hoverHelp =>$i18n->get("productURL description")
+ },
+ lastUpdated => {
+ defaultValue =>time(),
+ autoGenerate =>0,
+ noFormPost =>1,
+ },
+ );
+ push(@{$definition}, {
+ assetName=>$i18n->get('assetName'),
+ icon=>'MatrixListing.gif',
+ autoGenerateForms=>1,
+ tableName=>'MatrixListing',
+ className=>'WebGUI::Asset::MatrixListing',
+ properties=>\%properties
+ });
+ return $class->next::method($session, $definition);
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 duplicate
+
+ This method exists for demonstration purposes only. The superclass
+ handles duplicating MatrixListing Assets. This method will be called
+ whenever a copy action is executed
+
+=cut
+
+sub duplicate {
+ my $self = shift;
+ my $newAsset = $self->next::method(@_);
+ return $newAsset;
+}
+
+#-------------------------------------------------------------------
+
+=head2 getAutoCommitWorkflowId
+
+Gets the WebGUI::VersionTag workflow to use to automatically commit MatrixListings.
+By specifying this method, you activate this feature.
+
+=cut
+
+sub getAutoCommitWorkflowId {
+ my $self = shift;
+ return $self->getParent->get("submissionApprovalWorkflowId");
+}
+
+#-------------------------------------------------------------------
+
+=head2 getEditForm ( )
+
+Returns the TabForm object that will be used in generating the edit page for this asset.
+
+=cut
+
+sub getEditForm {
+ my $self = shift;
+ my $session = $self->session;
+ my $db = $session->db;
+ my $matrixId = $self->getParent->getId;
+ my $tabform = $self->next::method();
+ my $i18n = WebGUI::International->new($session, 'Asset_MatrixListing');
+
+ foreach my $category (keys %{$self->getParent->getCategories}) {
+ $tabform->getTab('properties')->raw('
'.$category.'
+
+
+
+|;
+ }
+
+ # Rating form
+
+ my %rating;
+ tie %rating, 'Tie::IxHash';
+ %rating = (
+ 1=>"1 - Worst",
+ 2=>2,
+ 3=>3,
+ 4=>4,
+ 5=>"5 - Respectable",
+ 6=>6,
+ 7=>7,
+ 8=>8,
+ 9=>9,
+ 10=>"10 - Best"
+ );
+ my $ratingsTable = "';
+ $ratingForm->submit(
+ -extras =>'class="ratingForm"',
+ -value =>$i18n->get('rate submit label'),
+ -label =>''.$i18n->get('show ratings').' '
+ );
+ if ($hasRated) {
+ $var->{ratings} = $ratingsTable;
+ } else {
+ $var->{ratings} = $ratingForm->print;
+ }
+
+ # Mail form
+
+ my $mailForm = WebGUI::HTMLForm->new($self->session,
+ -extras =>'class="content"',
+ -tableExtras=>'class="content"'
+ );
+ $mailForm->hidden(
+ -name =>"func",
+ -value =>"sendEmail"
+ );
+ $mailForm->captcha(
+ -name =>"verify"
+ );
+ $mailForm->email(
+ -extras =>'class="content"',
+ -name =>"from",
+ -value =>$self->session->user->profileField("email"),
+ -label =>$i18n->get('your email label'),
+ );
+ $mailForm->selectBox(
+ -name =>"subject",
+ -extras =>'class="content"',
+ -options =>{
+ $i18n->get('report error label') =>$i18n->get('report error label'),
+ $i18n->get('general comment label') =>$i18n->get('general comment label'),
+ },
+ -label =>$i18n->get('request type label'),
+ );
+ $mailForm->textarea(
+ -rows =>4,
+ -extras =>'class="content"',
+ -columns =>35,
+ -name =>"body",
+ -label =>$i18n->get('comment label'),
+ );
+ $mailForm->submit(
+ -extras =>'class="content"',
+ -value =>$i18n->get('send button label'),
+ );
+ $var->{emailForm} = $mailForm->print;
+
+ return $self->getParent->processStyle($self->processTemplate($var,undef, $self->{_viewTemplate}));
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 www_click ( )
+
+Redirects to the manufacturerUrl or productUrl and increments clicks.
+
+=cut
+
+sub www_click {
+ my $self = shift;
+
+ return $self->session->privilege->noAccess() unless $self->canView;
+
+ my $session = $self->session;
+
+ $self->incrementCounter('clicks');
+ if ($session->form->process("manufacturer")) {
+ $session->http->setRedirect( $self->get('manufacturerUrl') );
+ }
+ else {
+ $session->http->setRedirect( $self->get('productUrl') );
+ }
+ return undef;
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_edit ( )
+
+Web facing method which is the default edit page
+
+=cut
+
+sub www_edit {
+ my $self = shift;
+
+ return $self->session->privilege->noAccess() unless $self->getParent->canAddMatrixListing();
+
+ my $i18n = WebGUI::International->new($self->session, "Asset_MatrixListing");
+ return $self->session->privilege->insufficient() unless $self->canEdit;
+ return $self->session->privilege->locked() unless $self->canEditIfLocked;
+ return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('edit matrix listing title'));
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_getScreenshots ( )
+
+Returns the screenshots as xml.
+
+=cut
+
+sub www_getScreenshots {
+ my $self = shift;
+
+ return $self->session->privilege->noAccess() unless $self->canView;
+
+ $self->session->http->setMimeType('text/xml');
+
+ my $xml = qq |
+
+
+|;
+
+ if ( $self->get('screenshots') ) {
+ my $fileObject = WebGUI::Form::File->new($self->session,{ value=>$self->get('screenshots') });
+ my $storage = $fileObject->getStorageLocation;
+ my $path = $storage->getPath;
+ my @files = @{ $storage->getFiles } if (defined $storage);
+ foreach my $file (@files) {
+ unless ($file =~ m/^thumb-/){
+ my $thumb = 'thumb-'.$file;
+ $xml .= "
+
+ 400
+ 300
+ <![CDATA[<b>Slide</b> One]]>
+ ".$storage->getUrl($file)."
+ 5
+ ".$storage->getUrl($thumb)."
+
+ ";
+ }
+ }
+ }
+
+ $xml .= qq |
+
+
+|;
+
+ return $xml;
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_getScreenshotsConfig ( )
+
+Returns the xml config file for the ukplayer that displays the screenshots.
+
+=cut
+
+sub www_getScreenshotsConfig {
+ my $self = shift;
+
+ return $self->session->privilege->noAccess() unless $self->canView;
+
+ $self->session->http->setMimeType('text/xml');
+
+ my $xml = qq|
+
+
+ ?func=getScreenshots
+
+ 400
+ 300
+ 0xDDDDEE
+ 20
+ 100
+ 100
+
+ Verdana
+ 12
+ 0xCCCCCC
+ 0xCCCCCC
+ 0x000000
+ true
+
+ 0xCCCCCC
+ 0xCCCCCC
+ 0x000000
+ false
+
+ 48
+ 36
+ 0x000000
+ true
+ 100
+ 5
+
+ false
+ true
+ false
+ false
+
+|;
+
+ return $xml;
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_rate ( )
+
+Saves a rating of a matrix listing and returns the listing view.
+
+=cut
+
+sub www_rate {
+ my $self = shift;
+ my $form = $self->session->form;
+
+ my $hasRated = $self->hasRated;
+ my $sameRating = 1;
+ my $first = 1;
+ my $lastRating;
+
+ foreach my $category (keys %{$self->getParent->getCategories}) {
+ if ($first) {
+ $first=0;
+ } else {
+ if ($lastRating != $form->process($category)) {
+ $sameRating = 0;
+ }
+ }
+ $lastRating = $form->process($category);
+ }
+
+ # Throw out ratings that are all the same number, or if the user rates twice.
+ unless ($hasRated || $sameRating) {
+ $self->setRatings($self->session->form->paramsHashRef);
+ }
+
+ $self->prepareView;
+ return $self->view;
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_sendEmail ( )
+
+Sends an email to the maintainer of this matrix listing and returns www_view
+
+=cut
+
+sub www_sendEmail {
+ my $self = shift;
+ my $form = $self->session->form;
+
+ return $self->session->privilege->noAccess() unless $self->canView;
+
+ if ($form->process("verify","captcha")) {
+ if ($form->process("body") ne "") {
+ my $user = WebGUI::User->new($self->session, $self->get('maintainerId'));
+ my $mail = WebGUI::Mail::Send->create($self->session,{
+ to =>$user->profileField("email"),
+ subject =>$self->get('productName')." - ".$form->process("subject"),
+ from=>$form->process("from")
+ });
+ $mail->addText($form->process("body"));
+ $mail->addFooter;
+ $mail->queue;
+ }
+ }
+
+ $self->prepareView;
+ return $self->view(0,1);
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_view ( )
+
+Web facing method which is the default view page. This method does a
+302 redirect to the "showPage" file in the storage location.
+
+=cut
+
+sub www_view {
+ my $self = shift;
+ return $self->session->privilege->noAccess() unless $self->canView;
+ $self->prepareView;
+ return $self->view;
+}
+
+
+1;
+
+#vim:ft=perl
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 85bf29c32..753d12b48 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -1,183 +1,393 @@
package WebGUI::Asset::Wobject::Matrix;
-
+
+$VERSION = "2.0.0";
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com info@plainblack.com
+#-------------------------------------------------------------------
+
use strict;
+use warnings;
use Tie::IxHash;
-use WebGUI::Form;
-use WebGUI::HTMLForm;
-use WebGUI::Cache;
-use WebGUI::Mail::Send;
-use WebGUI::SQL;
-use WebGUI::Storage::Image;
-use WebGUI::User;
+use JSON;
+use WebGUI::International;
use WebGUI::Utility;
-use WebGUI::Inbox;
-use WebGUI::Asset::Wobject;
-use WebGUI::Asset::Wobject::Collaboration;
+use WebGUI::Asset::MatrixListing;
+use base 'WebGUI::Asset::Wobject';
+
+#----------------------------------------------------------------------------
+
+=head2 canAddMatrixListing ( )
+
+Returns true if able to add MatrixListings.
+
+ Checks to make sure that the
+ Calendar has been committed at least once. Checks to make sure that
+ the user is in the appropriate group (either the group that can edit
+ the calendar, or the group that can edit events in the calendar).
+
+=cut
+
+sub canAddMatrixListing {
+ my $self = shift;
+
+ return 1;
+=cut
+ my $userId = shift;
+
+ my $user = $userId
+ ? WebGUI::User->new( $self->session, $userId )
+ : $self->session->user
+ ;
+
+ return 1 if (
+ $user->isInGroup( $self->get("groupIdEventEdit") )
+ );
+=cut
+}
-
-our @ISA = qw(WebGUI::Asset::Wobject);
-
#-------------------------------------------------------------------
+
+=head2 definition ( )
+
+defines wobject properties for Matrix instances.
+
+=cut
+
sub definition {
- my $class = shift;
+ my $class = shift;
my $session = shift;
- my $definition = shift;
- my $i18n = WebGUI::International->new($session,"Asset_Matrix");
- push(@{$definition}, {
- icon=>'matrix.gif',
- tableName=>'Matrix',
- className=>'WebGUI::Asset::Wobject::Matrix',
+ my $definition = shift;
+ my $i18n = WebGUI::International->new($session, 'Asset_Matrix');
+
+ my %properties;
+ tie %properties, 'Tie::IxHash';
+ %properties = (
+ templateId =>{
+ fieldType =>"template",
+ defaultValue =>'matrixtmpl000000000001',
+ tab =>"display",
+ noFormPost =>0,
+ namespace =>"Matrix",
+ hoverHelp =>$i18n->get('template description'),
+ label =>$i18n->get('template label'),
+ },
+ searchTemplateId=>{
+ defaultValue =>"matrixtmpl000000000005",
+ fieldType =>"template",
+ tab =>"display",
+ namespace =>"Matrix/Search",
+ hoverHelp =>$i18n->get('search template description'),
+ label =>$i18n->get('search template label'),
+ },
+ detailTemplateId=>{
+ defaultValue =>"matrixtmpl000000000003",
+ fieldType =>"template",
+ tab =>"display",
+ namespace =>"Matrix/Detail",
+ hoverHelp =>$i18n->get('detail template description'),
+ label =>$i18n->get('detail template label'),
+ },
+ compareTemplateId=>{
+ defaultValue =>"matrixtmpl000000000002",
+ fieldType =>"template",
+ tab =>"display",
+ namespace =>"Matrix/Compare",
+ hoverHelp =>$i18n->get('compare template description'),
+ label =>$i18n->get('compare template label'),
+ },
+ defaultSort=>{
+ fieldType =>"selectBox",
+ tab =>"display",
+ options =>{
+ score => $i18n->get('sort by score label'),
+ title => $i18n->get('sort alpha numeric label'),
+ lineage => $i18n->get('sort by asset rank label'),
+ revisionDate => $i18n->get('sort by last updated label'),
+ },
+ defaultValue =>"score",
+ hoverHelp =>$i18n->get('default sort description'),
+ label =>$i18n->get('default sort label'),
+ },
+ compareColorNo=>{
+ fieldType =>"color",
+ tab =>"display",
+ defaultValue =>"#ffaaaa",
+ hoverHelp =>$i18n->get('compare color no description'),
+ label =>$i18n->get('compare color no label'),
+ },
+ compareColorLimited=>{
+ fieldType =>"color",
+ tab =>"display",
+ defaultValue =>"#ffffaa",
+ hoverHelp =>$i18n->get('compare color limited description'),
+ label =>$i18n->get('compare color limited label'),
+ },
+ compareColorCostsExtra=>{
+ fieldType =>"color",
+ tab =>"display",
+ defaultValue =>"#ffffaa",
+ hoverHelp =>$i18n->get('compare color costs extra description'),
+ label =>$i18n->get('compare color costs extra label'),
+ },
+ compareColorFreeAddOn=>{
+ fieldType =>"color",
+ tab =>"display",
+ defaultValue =>"#ffffaa",
+ hoverHelp =>$i18n->get('compare color free add on description'),
+ label =>$i18n->get('compare color free add on label'),
+ },
+ compareColorYes=>{
+ fieldType =>"color",
+ tab =>"display",
+ defaultValue =>"#aaffaa",
+ hoverHelp =>$i18n->get('compare color yes description'),
+ label =>$i18n->get('compare color yes label'),
+ },
+ categories=>{
+ fieldType =>"textarea",
+ tab =>"properties",
+ defaultValue =>$i18n->get('categories default value'),
+ hoverHelp =>$i18n->get('categories description'),
+ label =>$i18n->get('categories label'),
+ subtext =>$i18n->get('categories subtext'),
+ },
+ maxComparisons=>{
+ fieldType =>"integer",
+ tab =>"properties",
+ defaultValue =>25,
+ hoverHelp =>$i18n->get('max comparisons description'),
+ label =>$i18n->get('max comparisons label'),
+ },
+ maxComparisonsPrivileged=>{
+ fieldType =>"integer",
+ tab =>"properties",
+ defaultValue =>10,
+ hoverHelp =>$i18n->get('max comparisons privileged description'),
+ label =>$i18n->get('max comparisons privileged label'),
+ },
+ submissionApprovalWorkflowId=>{
+ fieldType =>"workflow",
+ tab =>"security",
+ type =>'WebGUI::VersionTag',
+ defaultValue =>"pbworkflow000000000003",
+ hoverHelp =>$i18n->get('submission approval workflow description'),
+ label =>$i18n->get('submission approval workflow label'),
+ },
+ ratingsDuration=>{
+ fieldType =>"interval",
+ tab =>"properties",
+ defaultValue =>7776000, # 3 months 3*30*24*60*60
+ hoverHelp =>$i18n->get('ratings duration description'),
+ label =>$i18n->get('ratings duration label'),
+ },
+ );
+ push(@{$definition}, {
assetName=>$i18n->get('assetName'),
- properties=>{
- visitorCacheTimeout => {
- tab => "display",
- fieldType => "interval",
- defaultValue => 3600,
- uiLevel => 8,
- label => $i18n->get("visitor cache timeout"),
- hoverHelp => $i18n->get("visitor cache timeout help")
- },
- categories=>{
- defaultValue=>"Features\nBenefits",
- fieldType=>"textarea"
- },
- maxComparisons=>{
- defaultValue=>10,
- fieldName=>"integer"
- },
- templateId=>{
- defaultValue=>"matrixtmpl000000000001",
- fieldType=>"template"
- },
- searchTemplateId=>{
- defaultValue=>"matrixtmpl000000000005",
- fieldType=>"template"
- },
- detailTemplateId=>{
- defaultValue=>"matrixtmpl000000000003",
- fieldType=>"template"
- },
- ratingDetailTemplateId=>{
- defaultValue=>"matrixtmpl000000000004",
- fieldType=>"template"
- },
- compareTemplateId=>{
- defaultValue=>"matrixtmpl000000000002",
- fieldType=>"template"
- },
- privilegedGroup=>{
- defaultValue=>'2',
- fieldType=>"group",
- },
- groupToRate=>{
- defaultValue=>'2',
- fieldType=>"group",
- },
- groupToAdd=>{
- defaultValue=>'2',
- fieldType=>"group",
- },
- maxComparisonsPrivileged=>{
- defaultValue=>10,
- fieldType=>"integer",
- },
- ratingTimeout=>{
- defaultValue=>60*60*24*365,
- fieldType=>"interval"
- },
- ratingTimeoutPrivileged=>{
- defaultValue=>60*60*24*365,
- fieldType=>"interval"
- }
- }
- });
- return $class->SUPER::definition($session, $definition);
+ icon=>'matrix.gif',
+ autoGenerateForms=>1,
+ tableName=>'Matrix',
+ className=>'WebGUI::Asset::Wobject::Matrix',
+ properties=>\%properties
+ });
+ return $class->SUPER::definition($session, $definition);
}
#-------------------------------------------------------------------
+
+=head2 deleteAttribute ( attributeId )
+
+Deletes an attribute and listing data for this attribute from Collateral.
+
+=head3 attributeId
+
+The id of the attribute that should be deleted.
+
+=cut
+
+sub deleteAttribute {
+
+ my $self = shift;
+ my $attributeId = shift;
+
+ $self->deleteCollateral("Matrix_attribute","attributeId",$attributeId);
+ #TODO: delete listing data, $self->deleteCollateral("Matrix_listingData","attributeId",$attributeId);
+
+ return undef;
+}
+
+#-------------------------------------------------------------------
+
+=head2 duplicate ( )
+
+duplicates a Matrix.
+
+=cut
+
sub duplicate {
- # Buggo: how do we duplicate these?
- return undef;
-}
-
-#-------------------------------------------------------------------
-# Too much data to keep track of modification dates, always assume new data
-sub getContentLastModified {
- return time();
-}
-
-#-------------------------------------------------------------------
-sub formatURL {
my $self = shift;
- my $func = shift;
- my $listingId = shift;
- my $url = $self->getUrl("func=".$func.";listingId=".$listingId);
- return $url;
+ my $newAsset = $self->SUPER::duplicate(@_);
+ return $newAsset;
}
+#-------------------------------------------------------------------
+
+=head2 editAttributeSave ( attributeProperties )
+
+Saves an attribute.
+
+=head3 attributeProperties
+
+A hashref containing the properties of the attribute.
+
+=cut
+
+sub editAttributeSave {
+ my $self = shift;
+ my $attributeProperties = shift;
+ my $session = $self->session;
+ my $form = $session->form;
+
+ return $session->privilege->insufficient() unless $self->canEdit;
+
+ my $attributeId = $self->setCollateral("Matrix_attribute","attributeId",$attributeProperties,0,1);
+
+ return $attributeId;
+}
#-------------------------------------------------------------------
+
+=head2 getAttribute ( attributeId )
+
+Returns a hash reference of the properties of an attribute.
+
+=head3 attributeId
+
+The unique id of an attribute.
+
+=cut
+
+sub getAttribute {
+ my ($self, $attributeId) = @_;
+ return $self->session->db->quickHashRef("select * from Matrix_attribute where attributeId=?",[$attributeId]);
+}
+
+#-------------------------------------------------------------------
+
+=head2 getCategories ( )
+
+Returns the categories for this Matrix as a hashref.
+
+=cut
+
sub getCategories {
- my $self = shift;
- my $cat = $self->getValue("categories");
- $cat =~ s/\r//g;
- chomp($cat);
- my @categories = split(/\n/,$cat);
- return @categories;
+ my $self = shift;
+ my %categories;
+ tie %categories, 'Tie::IxHash';
+ my $categories = $self->getValue("categories");
+ $categories =~ s/\r//g;
+ chomp($categories);
+ my @categories = split(/\n/,$categories);
+ foreach my $category (@categories) {
+ $categories{$category} = $category;
+ }
+ return \%categories;
+
}
#-------------------------------------------------------------------
+
+=head2 getCompareColor ( )
+
+Returns the compare form.
+
+=head3 value
+
+The value of a MatrixCompare form field.
+
+=cut
+
+sub getCompareColor {
+
+ my $self = shift;
+ my $value = shift;
+
+ if($value == 0){
+ return $self->get('compareColorNo');
+ }
+ elsif($value == 1){
+ return $self->get('compareColorLimited');
+ }
+ elsif($value == 2){
+ return $self->get('compareColorCostsExtra');
+ }
+ elsif($value == 3){
+ return $self->get('compareColorFreeAddOn');
+ }
+ elsif($value == 3){
+ return $self->get('compareColorYes');
+ }
+
+}
+
+#-------------------------------------------------------------------
+
+=head2 getCompareForm ( )
+
+Returns the compare form.
+
+=head3 selectedListingIds
+
+An array of listingIds that should be selected in the compare form.
+
+=cut
+
sub getCompareForm {
- my $self = shift;
- my @ids = @_;
- my $form = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
- .WebGUI::Form::submit($self->session, {
- value=>"compare"
- })
- ."getUrl("func=viewDetail").";listingId=',listingId,'\\\">', productName,' ') from Matrix_listing
- where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by productName")
- })
- ."
'
+ ."'.$category.' Sort by views Sort by compares Sort by clicks Sort by updated \n";
+ $html .= "\t\n";
+ $html .= "\t
\n";
+ $html .= "\t
\n";
+
+ $html .= "\t"
+ .$i18n->get('attribute defaultValue label')
+ ."".$i18n->get('attribute defaultValue description')."
"
+ .""
+ .$defaultValueForm." "
+ ."\t\n"
+ .$i18n->get('attribute options label')
+ ."".$i18n->get('attribute options description')."
"
+ .""
+ .$optionsForm." "
+ ."\t\n
";
+ $html .= "\t\n
\t\n
'.$i18n->get('show ratings').' '
- );
- if ($hasRated) {
- $var{'ratings'} = $ratingsTable;
- } else {
- $var{'ratings'} = $f->print;
- }
- return $self->processStyle($self->processTemplate(\%var,$self->get("detailTemplateId")));
+ push(@results, @{ $self->session->db->buildArrayRefOfHashRefs(
+ "select $fields $from where a.category=? and a.assetId=? order by a.name",
+ [@listingIds,$category,$self->getId]
+ ) });
+ }
+ foreach my $result (@results){
+ foreach my $listingId (@listingIds) {
+ $result->{attributId} =~ s/-/_____/g;
+ my $listingId_safe = $listingId;
+ $listingId_safe =~ s/-/_____/g;
+ if ($result->{fieldType} eq 'MatrixCompare'){
+ my $originalValue = $result->{$listingId_safe};
+ $result->{$listingId_safe.'_compareColor'} = $self->getCompareColor($result->{$listingId_safe});
+ $result->{$listingId_safe} = WebGUI::Form::MatrixCompare->new( $self->session,
+ { value=>$result->{$listingId_safe} },defaultValue=>0)->getValueAsHtml;
+ }
+ }
+ }
+
+ $jsonOutput->{ResultSet} = {Result=>\@results};
+
+ $session->http->setMimeType("application/json");
+
+ return JSON->new->utf8->encode($jsonOutput);
+}
+#-------------------------------------------------------------------
+
+=head2 www_listAttributes ( )
+
+Lists all attributes of this Matrix.
+
+=cut
+
+sub www_listAttributes {
+ my $self = shift;
+ my $session = $self->session;
+
+ return $session->privilege->insufficient() unless($self->canEdit);
+
+ my $i18n = WebGUI::International->new($session,'Asset_Matrix');
+ my $output = ""
+ .$i18n->get('add attribute label')." Edit Listing |
},
- 'edit field' => {
- lastUpdated => 1135279558,
- message => q|Edit Field |
+ 'edit attribute title' => {
+ lastUpdated => 0,
+ message => q|Edit/Add Attribute|
},
'good bad' => {
@@ -869,12 +949,20 @@ our $I18N = {
No, I made a mistake.
|,
},
- 'list fields' => {
- lastUpdated => 1135289632,
- message => q|Field List
- Add new field.
-
|,
- },
+ 'list attributes title' => {
+ lastUpdated => 0,
+ message => q|Attribute List|,
+ },
+
+ 'delete attribute confirm message' => {
+ message => q|Are you certain you wish to delete this attribute and all the data linked to it?|,
+ lastUpdated => 0,
+ },
+
+ 'add attribute label' => {
+ lastUpdated => 0,
+ message => q|Add Attribute|,
+ },
'yes' => {
lastUpdated => 1135279558,
@@ -906,38 +994,6 @@ our $I18N = {
message => q|Enter the name of the product. If there are entries for the product with different revisions, it would be best to make sure the names are the same.|
},
- 'version number description' => {
- lastUpdated => 1135279558,
- message => q|Enter the release or version number for the product.|
- },
-
- 'product url description' => {
- lastUpdated => 1135279558,
- message => q|If the product has its own website, enter the complete URL for it here.|
- },
-
- 'manufacturer name description' => {
- lastUpdated => 1135279558,
- message => q|Enter the manufacturer of the product.|
- },
-
- 'manufacturer url description' => {
- lastUpdated => 1135279558,
- message => q|If the manufacturer has a website, enter the complete URL for it here.|
- },
-
- 'description description' => {
- lastUpdated => 1135279558,
- message => q|Please give a general description of the product. Specific details can be rated in the form fields below.|
- },
-
- 'listing maintainer description' => {
- lastUpdated => 1136488950,
- message => q|If left blank, this will be the name of the user who created this product listing. The
- listing maintainer is allowed to edit this listing, even if they are not members of the group
- to add or edit listings.|
- },
-
'matrix specific fields description' => {
lastUpdated => 1135279558,
message => q|Each matrix is configured to compare the features and performance of various products. These features and performance criteria are displayed for you to rate on an item by item basis.|
@@ -948,55 +1004,46 @@ our $I18N = {
message => q|Matrix Specific Fields|
},
- 'field name description' => {
- lastUpdated => 1135279558,
- message => q|The name of the field that you are creating. It is case sensitive and must be unique.|
+ 'attribute name description' => {
+ lastUpdated => 0,
+ message => q|The name of the attribute that you are creating. It is case sensitive and must be unique.|
},
- 'field label description' => {
- lastUpdated => 1135279558,
- message => q|The name of the field that you are creating. It is case sensitive and must be unique.|
+# 'field label description' => {
+# lastUpdated => 1135279558,
+# message => q|The name of the field that you are creating. It is case sensitive and must be unique.|
+# },
+
+ 'fieldType description' => {
+ lastUpdated => 0,
+ message => q|The field type of attribute you are creating. Please select the field type from the options in the drop-down list.
|
},
- 'field type description' => {
- lastUpdated => 1167185918,
- message => q|The type of field you are creating. Please select the type from the following options in the drop-down list.
-
-
- Good Bad
- Defines availability of a feature, has it, doesn't have it, limited functionality, free add on, etc.
- Text
- A single line of text, like a short description or title.
- TextArea
- Multiple lines of text.
- URL
- A URL.
- Combo
- A combination Text box and drop down list.
- Enter in a default value for the attribute that will be used if the fieldType is
+selectBox.
|
},
- 'default value description' => {
- translatorsNote => q|Please do not translate the GoodBad field values, as described below|,
- lastUpdated => 1135279558,
- message => q|Enter in a default value for the field that will be used if the user leaves the field blank.
- For the GoodBad field, the possible values are "No", "Yes", "Free Add On", "Costs Extra", "Limited". While the displayed labels are internationalized, these values are not.
- For the Combo field, you may only enter in 1 value, but the user will be allowed to select any value entered in by other users. In other words, the drop-down list will contain all values entered in by users who enter unique data into this field.
|
+ 'attribute options description' => {
+ lastUpdated => 0,
+ message => q|Enter in options (one per line) for the attribute that will be used if the fieldType is
+selectBox.
|
},
'category description' => {
- lastUpdated => 1136503500,
- message => q|Select the category which this field falls into.|
+ lastUpdated => 0,
+ message => q|Select the category which this attribute falls into.|
},
};
diff --git a/t/Asset/MatrixListing.t b/t/Asset/MatrixListing.t
new file mode 100644
index 000000000..3ff5fd1a0
--- /dev/null
+++ b/t/Asset/MatrixListing.t
@@ -0,0 +1,63 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+##The goal of this test is to test the creation of a MatrixListing Asset.
+
+use WebGUI::Test;
+use WebGUI::Session;
+use Test::More tests => 2; # increment this value for each test you create
+use WebGUI::Asset::Wobject::Matrix;
+use WebGUI::Asset::MatrixListing;
+
+
+my $session = WebGUI::Test->session;
+my $node = WebGUI::Asset->getImportNode($session);
+my ($matrix, $matrixListing);
+
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+$versionTag->set({name=>"Matrix Listing Test"});
+
+$matrix = $node->addChild({className=>'WebGUI::Asset::Wobject::Matrix'});
+$versionTag->commit;
+$matrixListing = $matrix->addChild({className=>'WebGUI::Asset::MatrixListing'});
+
+# Wikis create and autocommit a version tag when a child is added. Lets get the name so we can roll it back.
+my $secondVersionTag = WebGUI::VersionTag->new($session,$matrixListing->get("tagId"));
+
+# Test for sane object types
+isa_ok($matrix, 'WebGUI::Asset::Wobject::Matrix');
+isa_ok($matrixListing, 'WebGUI::Asset::MatrixListing');
+
+# Try to add content under a MatrixListing asset
+#my $article = $matrixListing->addChild({className=>'WebGUI::Asset::Wobject::Article'});
+#is($article, undef, "Can't add an Article wobject as a child to a Matrix Listing.");
+
+# See if the duplicate method works
+#my $wikiPageCopy = $wikipage->duplicate();
+#isa_ok($wikiPageCopy, 'WebGUI::Asset::WikiPage');
+#my $thirdVersionTag = WebGUI::VersionTag->new($session,$wikiPageCopy->get("tagId"));
+
+
+#TODO: {
+# local $TODO = "Tests to make later";
+# ok(0, 'Lots and lots to do');
+#}
+
+END {
+ # Clean up after thy self
+ $versionTag->rollback();
+ $secondVersionTag->rollback();
+ #$thirdVersionTag->rollback();
+}
+
diff --git a/t/Asset/Wobject/Matrix.t b/t/Asset/Wobject/Matrix.t
new file mode 100644
index 000000000..4fc36012b
--- /dev/null
+++ b/t/Asset/Wobject/Matrix.t
@@ -0,0 +1,98 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use File::Spec;
+use lib "$FindBin::Bin/../../lib";
+
+##The goal of this test is to test the creation of UserList Wobjects.
+
+use WebGUI::Test;
+use WebGUI::Session;
+use Test::More tests => 10; # increment this value for each test you create
+use Test::Deep;
+use WebGUI::Asset::Wobject::Matrix;
+
+my $session = WebGUI::Test->session;
+
+# Do our work in the import node
+my $node = WebGUI::Asset->getImportNode($session);
+
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+$versionTag->set({name=>"Matrix Test"});
+my $matrix = $node->addChild({className=>'WebGUI::Asset::Wobject::Matrix'});
+
+# Test for a sane object type
+isa_ok($matrix, 'WebGUI::Asset::Wobject::Matrix');
+
+# Test to see if we can set new values
+my $newMatrixSettings = {
+ maxComparisons => 20,
+ defaultSort => 'assetRank',
+ compareColorNo => '#aaffaa',
+ submissionApprovalWorkflowId => 'pbworkflow000000000005',
+ categories => "category1\ncategory2",
+};
+$matrix->update($newMatrixSettings);
+
+foreach my $newSetting (keys %{$newMatrixSettings}) {
+ unless ($newSetting eq 'categories'){
+ is ($matrix->get($newSetting), $newMatrixSettings->{$newSetting}, "updated $newSetting is ".$newMatrixSettings->{$newSetting});
+ }
+}
+
+cmp_deeply (
+ $matrix->getCategories,
+ {
+ category1=>'category1',
+ category2=>'category2'
+ },
+ 'getCategories method returned correct hashref'
+ );
+
+
+# add a new attribute
+
+$session->user({userId => 3});
+
+my $attributeProperties = {
+ name =>'test attribute',
+ description =>'description of the test attribute',
+ category =>'category1',
+ };
+
+my $newAttributeId = $matrix->editAttributeSave($attributeProperties);
+
+my $newAttribute = $matrix->getAttribute($newAttributeId);
+
+my $isValidId = $session->id->valid($newAttributeId);
+
+is($isValidId,1,"editAttributeSave returnes a valid guid");
+
+is($newAttribute->{name},'test attribute',"Adding a new attribute, attribute name was set correctly");
+is($newAttribute->{fieldType},'MatrixCompare',"Adding a new attribute, undefined fieldType was set correctly to
+default value");
+
+# delete new attribute
+
+$matrix->deleteAttribute($newAttributeId);
+
+my $newAttribute = $matrix->getAttribute($newAttributeId);
+
+is($newAttribute->{attributeId},undef,"The new attribute was successfully deleted.");
+
+# TODO: test deleting of listing data for attribute
+
+END {
+ # Clean up after thy self
+ $versionTag->rollback();
+}
+