tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImportedrowsTable: sort by correct key column

Browse Source 
fixes #1924
fixes #1925
This commit is contained in:
Thomas Gelf 2019-09-25 16:29:44 +02:00
parent dad3b76d50
commit 26c272bba9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Director/Web/Table/ImportedrowsTable.php
View File

@ -16,6 +16,8 @@ class ImportedrowsTable extends SimpleQueryBasedTable
/** @var ImportRun */
protected $importRun;
protected $keyColumn;
public static function load(ImportRun $run)
{
$table = new static();
@ -35,12 +37,21 @@ class ImportedrowsTable extends SimpleQueryBasedTable
return $this;
}
protected function getKeyColumn()
{
if ($this->keyColumn === null) {
$this->keyColumn = $this->importRun->importSource()->get('key_column');
}
return $this->keyColumn;
}
public function getColumns()
{
if ($this->columns === null) {
$cols = $this->importRun->listColumnNames();
$keyColumn = $this->importRun->importSource()->get('key_column');
$keyColumn = $this->getKeyColumn();
if ($keyColumn !== null && ($pos = array_search($keyColumn, $cols)) !== false) {
unset($cols[$pos]);
array_unshift($cols, $keyColumn);
@ -87,6 +98,6 @@ class ImportedrowsTable extends SimpleQueryBasedTable
$this->importRun->fetchRows($this->columns)
);
return $ds->select()->order('object_name');
return $ds->select()->order($this->getKeyColumn());
}
}