From 6a2ba37ef1687631e653c76bae8613abc7eb3578 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 14 Apr 2006 21:35:00 +0000
Subject: [PATCH] fixed a display bug in asset search added a + next to items
 in the asset manager that have children templates now index their namespace
 so you can search on that

---
 docs/changelog/6.x.x.txt     |  2 ++
 lib/WebGUI/Asset.pm          | 13 +++++++------
 lib/WebGUI/Asset/Template.pm |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 525df9811..f1eb1bfee 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -38,6 +38,8 @@
  - Converted WebGUI to use a new object oriented session system. More details
    in migation.txt.
  - Added a sort alphabetically option to the folder asset.
+ - Added a symbol next to items in the asset manager to indicate if they have
+   children or not.
  - Added a screenshot feature to the matrix.
  - Added an option to delete Matrix fields.
  - Added an API for retrieving email from POP3 servers.
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 837a736a6..d2f077f8d 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1083,8 +1083,8 @@ sub manageAssets {
    //<![CDATA[
      var assetManager = new AssetManager();
          assetManager.AddColumn('".WebGUI::Form::checkbox($self->session,{extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
+         assetManager.AddColumn('".$i18n->get("rank")."','style=\"cursor:move\"','center','numeric');
          assetManager.AddColumn('&nbsp;','','center','');
-         assetManager.AddColumn('".$i18n->get("rank")."','style=\"cursor:move\"','right','numeric');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
          assetManager.AddColumn('".$i18n->get("type")."','','left','');
          assetManager.AddColumn('".$i18n->get("last updated")."','','center','');
@@ -1112,14 +1112,16 @@ sub manageAssets {
 			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/unlocked.gif" alt="unlocked" style="border: 0px;" />';
 		}
 		my $lockLink = ", '<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."</a>'";
+		my $plus = "'&nbsp;&nbsp;&nbsp;&nbsp;'+";
+		$plus = "'+ '+" if ($child->hasChildren);
          	$output .= "assetManager.AddLine('"
 			.WebGUI::Form::checkbox($self->session,{
 				name=>'assetId',
 				value=>$child->getId
 				})
-			."',".$edit."contextMenu.draw()," 
-			.$child->getRank
-			.",'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
+			."',".$child->getRank
+			.",".$edit."contextMenu.draw()"
+			.",".$plus."'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
 			."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName
 			."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
 			."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
@@ -1289,8 +1291,7 @@ sub manageAssetsSearch {
 				value=>$child->getId
 				})
 			."',".$edit."contextMenu.draw()," 
-			.$child->getRank
-			.",'<a href=\"".$child->getUrl("func=manageAssets&manage=1")."\">".$title
+			."'<a href=\"".$child->getUrl("func=manageAssets&manage=1")."\">".$title
 			."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName
 			."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
 			."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 4eae69028..6854eb5c0 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -251,6 +251,7 @@ Making private. See WebGUI::Asset::indexContent() for additonal details.
 sub indexContent {
 	my $self = shift;
 	my $indexer = $self->SUPER::indexContent;
+	$indexer->addKeywords($self->get("namespace"));
 	$indexer->setIsPublic(0);
 }