mirror of
https://github.com/openclassify/openclassify.git
synced 2026-01-24 22:11:01 -06:00
revert due to error (ambiguous columns)
This commit is contained in:
parent
356d79dffd
commit
2d2baa343c
@ -6,12 +6,12 @@ class AddTableCategoryColumn
|
|||||||
{
|
{
|
||||||
public function handle(TableIsQuerying $event)
|
public function handle(TableIsQuerying $event)
|
||||||
{
|
{
|
||||||
$query = $event->getQuery();
|
// $query = $event->getQuery();
|
||||||
$builder = $event->getBuilder();
|
// $builder = $event->getBuilder();
|
||||||
|
//
|
||||||
if ($builder->getModel() === "Visiosoft\AdvsModule\Adv\AdvModel") {
|
// if ($builder->getModel() === "Visiosoft\AdvsModule\Adv\AdvModel") {
|
||||||
$query->join('cats_category_translations as cats_trans', 'advs_advs.cat1', '=', 'cats_trans.entry_id')
|
// $query->join('cats_category_translations as cats_trans', 'advs_advs.cat1', '=', 'cats_trans.entry_id')
|
||||||
->select('advs_advs.*', 'cats_trans.name as cat');
|
// ->select('advs_advs.*', 'cats_trans.name as cat');
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,8 +153,13 @@ class AdvsController extends AdminController
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
'category' => [
|
'category' => [
|
||||||
'sort_column' => 'cat',
|
'value' => function (EntryInterface $entry, CategoryModel $categoryModel) {
|
||||||
'value' => 'entry.cat'
|
$category = $categoryModel->getCat($entry->cat1);
|
||||||
|
if (!is_null($category))
|
||||||
|
return $category->name;
|
||||||
|
}
|
||||||
|
// 'sort_column' => 'cat',
|
||||||
|
// 'value' => 'entry.cat'
|
||||||
],
|
],
|
||||||
'finish_at',
|
'finish_at',
|
||||||
]);
|
]);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user