gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16551 - Fix #16485 - Visual query builder missing "Build Query" button

Browse Source 
Pull-request: #16551
Fixes: #16485
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-12-31 23:25:11 +01:00
commit 0de7efe115
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/Controllers/Database/DesignerController.php
View File

@ -165,7 +165,9 @@ class DesignerController extends AbstractController
$display_page = -1;
$selected_page = null;
if (isset($_GET['query'])) {
$visualBuilderMode = isset($_GET['query']);
if ($visualBuilderMode) {
$display_page = $this->designerCommon->getDefaultPage($_GET['db']);
} elseif (! empty($_GET['page'])) {
$display_page = $_GET['page'];
@ -242,7 +244,7 @@ class DesignerController extends AbstractController
$script_contr,
$script_display_field,
$display_page,
isset($_GET['query']),
$visualBuilderMode,
$selected_page,
$classes_side_menu,
$tab_pos,

7
libraries/classes/Database/Designer.php
View File

@ -311,7 +311,7 @@ class Designer
* @param array $scriptContr initialization data array
* @param DesignerTable[] $scriptDisplayField displayed tables in designer with their display fields
* @param int $displayPage page number of the selected page
* @param bool $hasQuery whether this is visual query builder
* @param bool $visualBuilderMode whether this is visual query builder
* @param string $selectedPage name of the selected page
* @param array $paramsArray array with class name for various buttons on side menu
* @param array|null $tabPos table positions
@ -329,7 +329,7 @@ class Designer
array $scriptContr,
array $scriptDisplayField,
$displayPage,
$hasQuery,
bool $visualBuilderMode,
$selectedPage,
array $paramsArray,
?array $tabPos,
@ -391,7 +391,8 @@ class Designer
'get_db' => $getDb,
'designer_config' => json_encode($designerConfig),
'display_page' => (int) $displayPage,
'has_query' => $hasQuery,
'has_query' => $visualBuilderMode,
'visual_builder' => $visualBuilderMode,
'selected_page' => $selectedPage,
'params_array' => $paramsArray,
'theme' => $GLOBALS['PMA_Theme'],