Flesh out Revisions assetHelper.

Add a simple method to WebGUI::HTML to format an array as a table row.
Do not join non-asset tables in queries.

lib/WebGUI/AssetHelper/Revisions.pm

@@ -3,6 +3,8 @@ package WebGUI::AssetHelper::Revisions;
 use strict;
 use Class::C3;
 use base qw/WebGUI::AssetHelper/;
+use WebGUI::User;
+use WebGUI::HTML;
 
 =head1 LEGAL
 
@@ -40,10 +42,56 @@ Opens a new tab for displaying revisions of this asset.
 
 sub process {
     my ($class, $asset) = @_;
+    my $session = $asset->session;
+    my $i18n = WebGUI::International->new($session, "Asset");
+    if (! $asset->canEdit) {
+        return {
+            error => $i18n->get('38', 'WebGUI'),
+        }
+    }
 
     return {
-        open_tab => $asset->getUrl('func=manageRevisions'),
+        open_tab => $asset->getUrl('op=assetHelper;className=WebGUI::AssetHelper::Revisions;func=manageRevisions'),
     };
 }
 
+#-------------------------------------------------------------------
+
+=head2 www_manageRevisions ( $class, $asset )
+
+Displays a table of revision data for this asset, along with links to edit each revision, view it, or delete it.
+
+=cut
+
+sub www_manageRevisions {
+    my ($class, $asset) = @_;
+    my $session = $asset->session;
+    my $i18n    = WebGUI::International->new($session, "Asset");
+    if (! $asset->canEdit) {
+        return {
+            error => $i18n->get('38', 'WebGUI'),
+        }
+    }
+    my $output = sprintf qq{<table style="width: 100%;" class="content">\n
+        <tr><th></th><th>%s</th><th>%s</th><th>%s</th></tr>\n},
+        $i18n->get('revision date'), $i18n->get('revised by'), $i18n->get('tag name');
+    my $sth = $session->db->read("select ad.revisionDate, ad.revisedBy, at.name, ad.tagId from assetData as ad
+		left join assetVersionTag as at on ad.tagId=at.tagId where ad.assetId=? order by revisionDate desc", [$asset->getId]);
+    my $url = $asset->get('url');
+    while (my ($date, $userId, $tagName, $tagId) = $sth->array) {
+        my $user = WebGUI::User->new($session, $userId);
+        $output .= WebGUI::HTML::arrayToRow(
+			 $session->icon->delete("func=purgeRevision;revisionDate=".$date, $url, $i18n->get("purge revision prompt"))
+			.$session->icon->view( "func=view;revision=" . $date )
+            .$session->icon->edit( "func=edit;revision=" . $date ), 
+			$session->datetime->epochToHuman($date),
+			$user->username,
+			'<a href="'.$asset->getUrl("op=manageRevisionsInTag;tagId=".$tagId).'">'.$tagName.'</a>'
+        );
+    }
+    $sth->finish;
+    $output .= '</table>';
+    return $output;
+}
+
 1;

lib/WebGUI/HTML.pm

@@ -39,6 +39,7 @@ A package for manipulating and massaging HTML.
  $html = WebGUI::HTML::makeAbsolute($session, $html);
  $html = WebGUI::HTML::processReplacements($session, $html);
  $html = WebGUI::HTML::splitTag([$tag,]$html[,$count]);    # defaults to ( 'p', $html, 1 )
+ $html = WebGUI::HTML::arrayToRow(@columnData);
 
 =head1 METHODS
 
@@ -47,6 +48,27 @@ These methods are available from this package:
 =cut
 
 
+#-------------------------------------------------------------------
+
+=head2 arrayToRow ( @columnData )
+
+Wraps each element of @columnData in a table cell tag, concatenates them all together,
+and then wraps that in table row tags.
+
+=head3 @columnData
+
+An array of strings to wrap.
+
+=cut
+
+sub arrayToRow {
+    my @columnData = @_;
+    my $output = '<tr><td>';
+    $output .= join '</td><td>', @columnData;
+    $output .= '</td></tr>';
+    return $output;
+}
+
 #-------------------------------------------------------------------
 
 =head2 cleanSegment ( html , preserveStyleScript )

t/HTML/addToRow.t

@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 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";
+
+use WebGUI::Test;
+use WebGUI::HTML;
+use WebGUI::Session;
+
+use Test::More;
+use Test::Deep;
+use Data::Dumper;
+
+my $session = WebGUI::Test->session;
+
+plan tests => 3;
+
+is WebGUI::HTML::arrayToRow(1),
+   '<tr><td>1</td></tr>',
+   'addToRow: 1 element';
+
+is WebGUI::HTML::arrayToRow(1,2),
+   '<tr><td>1</td><td>2</td></tr>',
+   '... 2 elements';
+
+is WebGUI::HTML::arrayToRow(),
+   '<tr><td></td></tr>',
+   '... 0 elements';