loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix viste

This commit is contained in:
Pek5892 2024-05-13 12:59:39 +02:00
parent 869a7fddab
commit c35e24d08b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Util/Query.php
View File

@ -439,11 +439,11 @@ class Query
$select = []; $select = [];
foreach ($views as $view) { foreach ($views as $view) {
$select[] = $view['query'].(!empty($view['name']) ? " AS '".$view['name']."'" : ''); $select[] = $view['query'].(!empty($view['title']) ? " AS '".$view['title']."'" : '');
if (!empty($view['visible'])) { if (!empty($view['visible'])) {
if (!empty($view['name'])) { if (!empty($view['title'])) {
$view['name'] = trim($view['name']); $view['title'] = trim($view['title']);
} }
if (!empty($view['search_inside'])) { if (!empty($view['search_inside'])) {
$view['search_inside'] = trim($view['search_inside']); $view['search_inside'] = trim($view['search_inside']);
@ -452,21 +452,21 @@ class Query
$view['order_by'] = trim($view['order_by']); $view['order_by'] = trim($view['order_by']);
} }
$fields[] = trim($view['name']); $fields[] = $view['title'] ? trim($view['title']) : $view['name'];
$search_inside[] = !empty($view['search_inside']) ? $view['search_inside'] : '`'.$view['name'].'`'; $search_inside[] = !empty($view['search_inside']) ? $view['search_inside'] : '`'.$view['title'].'`';
$order_by[] = !empty($view['order_by']) ? $view['order_by'] : '`'.$view['name'].'`'; $order_by[] = !empty($view['order_by']) ? $view['order_by'] : '`'.$view['title'].'`';
$search[] = $view['search']; $search[] = $view['search'];
$slow[] = $view['slow']; $slow[] = $view['slow'];
$format[] = $view['format']; $format[] = $view['format'];
$html_format[] = $view['html_format']; $html_format[] = $view['html_format'];
if ($view['summable']) { if ($view['summable']) {
$summable[] = 'SUM(`'.trim($view['name']."`) AS 'sum_".(count($fields) - 1)."'"); $summable[] = 'SUM(`'.trim($view['title']."`) AS 'sum_".(count($fields) - 1)."'");
} }
if ($view['avg']) { if ($view['avg']) {
$avg[] = 'AVG(`'.trim($view['name']."`) AS 'avg_".(count($fields) - 1)."'"); $avg[] = 'AVG(`'.trim($view['title']."`) AS 'avg_".(count($fields) - 1)."'");
} }
} }
} }