diff --git a/application/tables/PropertymodifierTable.php b/application/tables/PropertymodifierTable.php index 3bf9bf53..bc708c3e 100644 --- a/application/tables/PropertymodifierTable.php +++ b/application/tables/PropertymodifierTable.php @@ -12,7 +12,9 @@ class PropertymodifierTable extends QuickTable 'id' => 'm.id', 'source_id' => 'm.source_id', 'source_name' => 's.source_name', - 'property_name' => 'm.property_name', + 'property' => 'CASE WHEN m.target_property IS NULL' + . ' THEN m.property_name' + . " ELSE m.target_property || ' <- ' || m.property_name END", 'provider_class' => 'm.provider_class', 'priority' => 'm.priority', ); @@ -33,7 +35,7 @@ class PropertymodifierTable extends QuickTable { $view = $this->view(); return array( - 'property_name' => $view->translate('Property'), + 'property' => $view->translate('Property'), ); } @@ -48,7 +50,8 @@ class PropertymodifierTable extends QuickTable array('m' => 'import_row_modifier'), 's.id = m.source_id', array() - )->order('m.property_name'); + )->order('property') + ->order('priority'); return $query; }