Fixed NPM filter

roland-d · roland-d · commit d1419dc89308 · 2023-08-25T20:34:03.000+02:00
Signed-off-by: Roland Dalmulder &lt;contact@rolandd.com&gt;
diff --git a/administrator/components/com_patchtester/src/Model/PullsModel.php b/administrator/components/com_patchtester/src/Model/PullsModel.php
@@ -256,11 +256,10 @@ protected function getListQuery()
             $query->where($db->quoteName('pulls.is_rtc') . ' = ' . $value);
         }
 
-        $npm = $this->getState()->get('filter.npm');
-        if (!empty($npm)) {
-            // Not applied patches have a NULL value, so build our value part of the query based on this
-            $value = $npm === 'no' ? '0' : '1';
-            $query->where($db->quoteName('pulls.is_npm') . ' = ' . $value);
+        $npm = $this->getState()->get('filter.npm', '');
+
+        if (strlen($npm) === 1) {
+            $query->where($db->quoteName('pulls.is_npm') . ' = ' . (int) $npm);
         }
 
         $draft = $this->getState()->get('filter.draft');

Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,10 @@ protected function getListQuery()`
`256`	`256`	`$query->where($db->quoteName('pulls.is_rtc') . ' = ' . $value);`
`257`	`257`	`}`
`258`	`258`
`259`		`- $npm = $this->getState()->get('filter.npm');`
`260`		`- if (!empty($npm)) {`
`261`		`- // Not applied patches have a NULL value, so build our value part of the query based on this`
`262`		`- $value = $npm === 'no' ? '0' : '1';`
`263`		`- $query->where($db->quoteName('pulls.is_npm') . ' = ' . $value);`
	`259`	`+ $npm = $this->getState()->get('filter.npm', '');`
	`260`	`+`
	`261`	`+ if (strlen($npm) === 1) {`
	`262`	`+ $query->where($db->quoteName('pulls.is_npm') . ' = ' . (int) $npm);`
`264`	`263`	`}`
`265`	`264`
`266`	`265`	`$draft = $this->getState()->get('filter.draft');`