From b8917d4e57696688ed6a89c52418b06b7a9922bc Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 9 Aug 2010 19:27:45 -0700
Subject: [PATCH] Make sure that keywords are always returned in alphabetical
 order in the WikiMaster byKeyword view.

---
 lib/WebGUI/Asset/Wobject/WikiMaster.pm |  6 +++++-
 t/Asset/Wobject/WikiMaster.t           | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index aa34072e4..50c35273b 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -552,7 +552,11 @@ sub getKeywordHierarchy {
         my $datum = {
             title       => $keyword,  ##Note, same as keyword
             url         => $self->getUrl('func=byKeyword;keyword='.$keyword),
-            descendants => scalar @{ $assetKeyword->getMatchingAssets( { startAsset => $self, keyword => $keyword, }) },
+            descendants => scalar @{ $assetKeyword->getMatchingAssets( {
+                                        startAsset => $self,
+                                        keyword    => $keyword,
+                                        sortOrder  => 'Alphabetically',
+                                  }) },
         };
         ##Prevent recursion if seen again
         if (! $seen->{$keyword}++) {
diff --git a/t/Asset/Wobject/WikiMaster.t b/t/Asset/Wobject/WikiMaster.t
index 078cea41e..6fef63f59 100644
--- a/t/Asset/Wobject/WikiMaster.t
+++ b/t/Asset/Wobject/WikiMaster.t
@@ -155,30 +155,30 @@ my $tag_set2 = WebGUI::VersionTag->getWorking($session);
 $tag_set2->commit;
 WebGUI::Test->addToCleanup($tag_set2);
 
-cmp_bag(
+cmp_deeply(
     $wiki->getKeywordHierarchy(),
     [
         {
             title => 'criminals', url   => '/testwiki?func=byKeyword;keyword=criminals',
-            children => bag(
-                superhashof({ title => 'red', }),
+            children => set(
                 superhashof({ title => 'andy', }),
+                superhashof({ title => 'red', }),
             ),
             descendants => 0,
         },
         {
             title => 'inmates', url   => '/testwiki?func=byKeyword;keyword=inmates',
-            children => bag(
-                superhashof({ title => 'heywood', }),
+            children => set(
                 superhashof({ title => 'brooks', }),
+                superhashof({ title => 'heywood', }),
             ),
             descendants => 0,
         },
         {
             title => 'staff', url   => '/testwiki?func=byKeyword;keyword=staff',
-            children => bag(
-                superhashof({ title => 'norton', }),
+            children => set(
                 superhashof({ title => 'hadley', }),
+                superhashof({ title => 'norton', }),
             ),
             descendants => 0,
         },
@@ -194,22 +194,22 @@ my $tag_set3 = WebGUI::VersionTag->getWorking($session);
 $tag_set3->commit;
 WebGUI::Test->addToCleanup($tag_set3);
 
-cmp_bag(
+cmp_deeply(
     $wiki->getKeywordHierarchy(),
     [
         superhashof({
             title    => 'criminals',
-            children => bag(
+            children => set(
                 superhashof({
                     title    => 'andy',
-                    children => bag(
+                    children => set(
                         superhashof({
                             title => 'inmates',
-                            children => bag(
+                            children => set(
                                 superhashof({ title => 'heywood', }),
                                 superhashof({
                                     title    => 'brooks',
-                                    children => bag(
+                                    children => set(
                                         superhashof({ title => 'criminals', }),
                                     ),
                                 }),
@@ -226,7 +226,7 @@ cmp_bag(
         }),
         superhashof({
             title    => 'staff',
-            children => bag(
+            children => set(
                 superhashof({ title => 'norton', }),
                 superhashof({ title => 'hadley', }),
             ),