From 8ae2457370056aa2f17b31ffd66c436480546caf Mon Sep 17 00:00:00 2001
From: Chris Hanson <chris@plainblack.com>
Date: Fri, 26 Aug 2011 15:51:58 -0500
Subject: [PATCH] fixed AssetReport: "Order the results by" issues  (#12227)

---
 docs/changelog/7.x.x.txt                | 1 +
 lib/WebGUI/Asset/Wobject/AssetReport.pm | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 56f0fe31e..1c1383c34 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fixed #12225: Stock asset, multiple instances on a page
  - fixed #12229: Indexed thingy data has gateway url prepended to it
  - fixed #12195: Visitor group by scratch membership shared among all Visitors (Dale Trexel)
+ - fixed #12227: Corrected AssetReport such that OrderBy works correctly.
 
 7.10.22
  - rfe   #12223: Add date type to content profiling (metadata)
diff --git a/lib/WebGUI/Asset/Wobject/AssetReport.pm b/lib/WebGUI/Asset/Wobject/AssetReport.pm
index 351654097..9415be618 100644
--- a/lib/WebGUI/Asset/Wobject/AssetReport.pm
+++ b/lib/WebGUI/Asset/Wobject/AssetReport.pm
@@ -159,9 +159,8 @@ sub getTemplateVars {
         $rules->{'whereClause'} .= qq{$prop $op $value};
     }
 
-    if($rules->{'whereClause'}) {
-        $rules->{'joinClass'}   = $settings->{className};
-    }
+    # Always join to the class, asset and assetData are excluded by getLineageSql
+    $rules->{'joinClass'}   = $settings->{className};
 
     #Build the order by condition
     my $order                 = $settings->{order};