Filtering works properly (Fix #5)

Author: Michael Babker

administrator/components/com_patchtester/models/pulls.php

@@ -97,10 +97,10 @@ public function __construct($config = array())
 	protected function populateState($ordering = null, $direction = null)
 	{
 		// Load the filter state.
-		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '');
 		$this->setState('filter.search', $search);
 
-		$searchId = $this->getUserStateFromRequest($this->context . '.filter.searchid', 'filter_searchid');
+		$searchId = $this->getUserStateFromRequest($this->context . '.filter.searchid', 'filter_searchid', '');
 		$this->setState('filter.searchid', $searchId);
 
 		// Load the parameters.
@@ -167,11 +167,13 @@ public function getItems()
 
 		try
 		{
-			$cacheFile = JPATH_CACHE . '/patchtester-page-' . $this->getPagination()->pagesCurrent . '.json';
-			$params    = $this->getState('params');
+			$cacheFile  = JPATH_CACHE . '/patchtester-page-' . $this->getPagination()->pagesCurrent . '.json';
+			$params     = $this->getState('params');
+			$searchId   = $this->getState('filter.searchid');
+			$searchWord = $this->getState('filter.search');
 
-			// Check if caching is enabled
-			if ($params->get('cache', 1) == 1)
+			// Check if caching is enabled or that we aren't filtering
+			if ($params->get('cache', 1) == 1 && $searchId != '' && $searchWord != '')
 			{
 				// Fetch cache time from component parameters and convert to seconds
 				$cacheTime = $params->get('cache_lifetime', 60);
@@ -221,8 +223,17 @@ protected function requestFromGithub()
 			$search   = $this->getState('filter.search');
 			$searchId = $this->getState('filter.searchid');
 
-			$pulls = $this->github->pulls->getList($this->getState('github_user'), $this->getState('github_repo'), 'open', $page);
-			usort($pulls, array($this, 'sortItems'));
+			// Check if we're searching for a single PR
+			if ($searchId != '' && $search == '')
+			{
+				$pulls = array();
+				$pulls[0] = $this->github->pulls->get($this->getState('github_user'), $this->getState('github_repo'), $searchId);
+			}
+			else
+			{
+				$pulls = $this->github->pulls->getList($this->getState('github_user'), $this->getState('github_repo'), 'open', $page);
+				usort($pulls, array($this, 'sortItems'));
+			}
 
 			foreach ($pulls as $i => &$pull)
 			{
@@ -232,12 +243,6 @@ protected function requestFromGithub()
 					continue;
 				}
 
-				if ($searchId && $pull->number != $searchId)
-				{
-					unset($pulls[$i]);
-					continue;
-				}
-
 				// Try to find a Joomlacode issue number
 				$pulls[$i]->joomlacode_issue = 0;
 
@@ -268,7 +273,7 @@ protected function requestFromGithub()
 			// If caching is enabled, save the request data
 			$params = $this->getState('params');
 
-			if ($params->get('cache') == 1)
+			if ($params->get('cache', 1) == 1 && $searchId != '' && $search != '')
 			{
 				$data = json_encode($pulls);
 				file_put_contents(JPATH_CACHE . '/patchtester-page-' . $this->getPagination()->pagesCurrent . '.json', $data);