From 5df6009f087a4ac1973db55412b3a6cde809a006 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Tue, 7 Apr 2015 13:19:11 +0000
Subject: [PATCH] #1082 Dashlet badge: do not display search results everytime.

SVN:trunk[3539]
---
 application/displayblock.class.inc.php |  2 +-
 pages/UI.php                           | 46 ++++++++++++++------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 6da564d7f..da5b83b7c 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -702,7 +702,7 @@ class DisplayBlock
 			{
 				$sHtml .= "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=new&class={$sClass}&$sParams\">".Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($sClass))."</a><br/>\n";
 			}
-			$sHtml .= "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search_form&class={$sClass}&$sParams\">".Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass))."</a>\n";
+			$sHtml .= "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search_form&do_search=0&class={$sClass}&$sParams\">".Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass))."</a>\n";
 			$sHtml .= '</p>';
 			break;
 
diff --git a/pages/UI.php b/pages/UI.php
index 479ec5b49..98f254976 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -149,7 +149,7 @@ function DisplayDetails($oP, $sClass, $oObj, $id)
  * @param $sBaseClass string The base class for the search (can be different from the actual class of the results)
  * @param $sFormat string The format to use for the output: csv or html
  */
-function DisplaySearchSet($oP, $oFilter, $bSearchForm = true, $sBaseClass = '', $sFormat = '')
+function DisplaySearchSet($oP, $oFilter, $bSearchForm = true, $sBaseClass = '', $sFormat = '', $bDoSearch = true)
 {
 	if ($bSearchForm)
 	{
@@ -161,17 +161,20 @@ function DisplaySearchSet($oP, $oFilter, $bSearchForm = true, $sBaseClass = '',
 		$oBlock = new DisplayBlock($oFilter, 'search', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oP, 0);
 	}
-	if (strtolower($sFormat) == 'csv')
+	if ($bDoSearch)
 	{
-		$oBlock = new DisplayBlock($oFilter, 'csv', false);
-		$oBlock->Display($oP, 1);
-		// Adjust the size of the Textarea containing the CSV to fit almost all the remaining space
-		$oP->add_ready_script(" $('#1>textarea').height($('#1').parent().height() - $('#0').outerHeight() - 30).width( $('#1').parent().width() - 20);"); // adjust the size of the block
-	}
-	else
-	{
-		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, 1);
+		if (strtolower($sFormat) == 'csv')
+		{
+			$oBlock = new DisplayBlock($oFilter, 'csv', false);
+			$oBlock->Display($oP, 1);
+			// Adjust the size of the Textarea containing the CSV to fit almost all the remaining space
+			$oP->add_ready_script(" $('#1>textarea').height($('#1').parent().height() - $('#0').outerHeight() - 30).width( $('#1').parent().width() - 20);"); // adjust the size of the block
+		}
+		else
+		{
+			$oBlock = new DisplayBlock($oFilter, 'list', false);
+			$oBlock->Display($oP, 1);
+		}
 	}
 }
 
@@ -496,16 +499,17 @@ try
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		case 'search_form': // Search form
-			$sClass = utils::ReadParam('class', '', false, 'class');
-			$sFormat = utils::ReadParam('format', 'html');
-			$bSearchForm = utils::ReadParam('search_form', true);
-			if (empty($sClass))
-			{
-				throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'class'));
-			}
-			$oP->set_title(Dict::S('UI:SearchResultsPageTitle'));
-			$oFilter =  new DBObjectSearch($sClass);
-		DisplaySearchSet($oP, $oFilter, $bSearchForm, '' /* sBaseClass */, $sFormat);
+		$sClass = utils::ReadParam('class', '', false, 'class');
+		$sFormat = utils::ReadParam('format', 'html');
+		$bSearchForm = utils::ReadParam('search_form', true);
+		$bDoSearch = utils::ReadParam('do_search', true);
+		if (empty($sClass))
+		{
+			throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'class'));
+		}
+		$oP->set_title(Dict::S('UI:SearchResultsPageTitle'));
+		$oFilter =  new DBObjectSearch($sClass);
+		DisplaySearchSet($oP, $oFilter, $bSearchForm, '' /* sBaseClass */, $sFormat, $bDoSearch);
 		break;
 		
 		///////////////////////////////////////////////////////////////////////////////////////////