Version 0.9.13

admin/src/Model/PartsModel.php

@@ -11,10 +11,11 @@
 namespace KW4NZ\Component\Depot\Administrator\Model;
 
 use Joomla\CMS\MVC\Model\ListModel;
-// use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 class PartsModel extends ListModel
 {
@@ -31,6 +32,10 @@ class PartsModel extends ListModel
 			'd.alias',
 			'quantity',
 			'd.quantity',
+			'ordering',
+			'd.ordering',
+			'description',
+			'd.description',
 			'published',
 			'd.published',
 			'package',
@@ -75,6 +80,8 @@ class PartsModel extends ListModel
 					$db->quoteName('d.quantity_exp'),
 					$db->quoteName('d.ordering'),
 					$db->quoteName('d.package_id'),
+					$db->quoteName('d.checked_out'),
+					$db->quoteName('d.checked_out_time'),
 				]
 			)
 		)
@@ -103,6 +110,7 @@ class PartsModel extends ListModel
 			$like = $db->quote('%' . $search . '%');
 			$query->where($db->quoteName('d.component_name') . ' LIKE ' . $like);
 		}
+
 		// Filter by published state
 		$published = (string) $this->getState('filter.published');
 		if (is_numeric($published)) {
@@ -114,9 +122,10 @@ class PartsModel extends ListModel
 		}
 
 		// add list ordering clause
-		$orderCol = $this->state->get('list.ordering', 'id');
-		$orderDirn = $this->state->get('list.direction', 'desc');
-		$query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+		$query->order(
+			$db->quoteName($db->escape($this->getState('list.ordering', 'd.ordering'))) . ' ' .
+			$db->escape($this->getState('list.direction', 'ASC'))
+		);
 
 		return $query;
 	}