Merge pull request #39 from m0hamed/fix/better_handle_same_reports

Fix/better handle same reports
phpmyadmin · Mar 18, 2014 · d12b201 · d12b201
2 parents d38d925 + 9ce7925
commit d12b201
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/Config/oauth.example.php b/app/Config/oauth.example.php
@@ -27,6 +27,6 @@
  * user. You can then enter the resultant token here
  */
 Configure::write('SourceForgeCredentials', array(
-	'key' => 'b9404a915db97d594cac',
-	'secret' => '2af63d5258742d4f0c9820c26252b435210faf58d0e2af2a248e1b11ce0d92ca80cba6bba98e0828'
+	'key' => '<oauth-token-key>',
+	'secret' => '<oauth-token-secret>'
 ));
diff --git a/app/Controller/ReportsController.php b/app/Controller/ReportsController.php
@@ -84,7 +84,10 @@ public function data_tables() {
 
 		$params = array(
 			'fields' => $aColumns,
-			'conditions' => $searchConditions,
+			'conditions' => array(
+					$searchConditions,
+					'related_to' => NULL
+				),
 			'order' => $orderConditions,
 		);
 

diff --git a/app/Test/Case/Controller/ReportsControllerTest.php b/app/Test/Case/Controller/ReportsControllerTest.php
@@ -72,12 +72,11 @@ public function testDataTables() {
 		));
 		$expected = array(
 			'iTotalRecords' => 3,
-			'iTotalDisplayRecords' => 3,
+			'iTotalDisplayRecords' => 2,
 			'sEcho' => 1,
 			'aaData' => array(
 				array('1', 'error2', 'Lorem ipsum dolor sit amet', '4.0', 'new'),
-				array('2', 'error2', 'Lorem ipsum dolor sit amet', '4.0', 'new'),
-				array('4', 'error1', 'Lorem ipsum dolor sit amet', '3.8', 'new')
+				array('2', 'error2', 'Lorem ipsum dolor sit amet', '4.0', 'new')
 			)
 		);
 		$result = json_decode($this->contents, true);