From e1c69f91d9b123b871c8cbad9c555b7dab7a0f70 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 3 Mar 2007 22:25:36 +0000
Subject: [PATCH] fix display of assets in clipboard that cannot be trashed

---
 docs/changelog/7.x.x.txt     |  1 +
 lib/WebGUI/AssetClipboard.pm | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 514f86f80..8ec6c6825 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fix: the fileImport script did not resize vertical images. (Martin Kamerbeek / Oqapi)
  - fix: TrashClipboard.pm (thanks to Erik Svanberg for the patch)
  - fix: Manage events in time tracker goofed up (perlDreamer Consulting, LLC)
+ - fix: Clipboard to trash (perlDreamer Consulting, LLC)
 
 7.3.11
  - Added an option for enabling coverage tests to testCodebase.pl.
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 816147cf7..1980b068b 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -105,12 +105,13 @@ If not specified, uses current user.
 
 sub getAssetsInClipboard {
 	my $self = shift;
+    my $session = $self->session;
 	my $limitToUser = shift;
-	my $userId = shift || $self->session->user->userId;
+	my $userId = shift || $session->user->userId;
 	my @assets;
 	my $limit;
 	if ($limitToUser) {
-		$limit = "and asset.stateChangedBy=".$self->session->db->quote($userId);
+		$limit = "and asset.stateChangedBy=".$session->db->quote($userId);
 	}
         my $sth = $self->session->db->read("
                 select 
@@ -123,15 +124,15 @@ sub getAssetsInClipboard {
                         assetData on asset.assetId=assetData.assetId 
                 where 
 			asset.state='clipboard'
-			and assetData.revisionDate=(SELECT max(revisionDate) from assetData where assetData.assetId=asset.assetId)
+			and assetData.revisionDate=(SELECT max(revisionDate) from assetData where assetData.assetId=asset.assetId and (assetData.status='approved' or assetData.tagId=?))
 			$limit
 		group by
 			assetData.assetId
                 order by 
                         assetData.title desc
-                        ");
+                        ", [$session->scratch->get("versionTag")]);
         while (my ($id, $date, $class) = $sth->array) {
-                push(@assets, WebGUI::Asset->new($self->session,$id,$class,$date));
+                push(@assets, WebGUI::Asset->new($session,$id,$class,$date));
         }
         $sth->finish;
         return \@assets;