Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JavaScript error in Designer: getElementById() #14079 issue fix #14097

Closed
wants to merge 10 commits into from
Closed

JavaScript error in Designer: getElementById() #14079 issue fix #14097

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9fc484
Central columns attributes don't get filled in #12772 issue solved
aswaniprakash Mar 12, 2018
286d5b6
query builder issue #14049 fix
aswaniprakash Mar 13, 2018
33d6b92
Merge branch 'aswaniprakash' of https://github.com/aswaniprakash/phpm…
aswaniprakash Mar 13, 2018
90fbcc3
query builder issue #14049 fix
aswaniprakash Mar 13, 2018
a38c52b
query builder issue #14049 fix
aswaniprakash Mar 13, 2018
1e1f093
code quality issue fixed
aswaniprakash Mar 14, 2018
26248b3
JavaScript error in Designer: getElementById() #14079 issue fix
aswaniprakash Mar 19, 2018
99ef10f
JavaScript error in Designer: getElementById() #14079 issue fix
aswaniprakash Mar 19, 2018
c0732e2
File permission corrected #14079
aswaniprakash Mar 27, 2018
d73e24e
File permission changed #14079
aswaniprakash Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions db_designer.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,11 @@

$response->addHTML($databaseDesigner->getNewRelationPanel());
$response->addHTML($databaseDesigner->getDeleteRelationPanel());

if (isset($_REQUEST['query'])) {
$response->addHTML($databaseDesigner->getOptionsPanel());
$response->addHTML($databaseDesigner->getRenameToPanel());
$response->addHTML($databaseDesigner->getHavingQueryPanel());
$response->addHTML($databaseDesigner->getAggregateQueryPanel());
$response->addHTML($databaseDesigner->getWhereQueryPanel());
$response->addHTML($databaseDesigner->getQueryDetails($_GET['db']));
}
$response->addHTML($databaseDesigner->getOptionsPanel());
$response->addHTML($databaseDesigner->getRenameToPanel());
$response->addHTML($databaseDesigner->getHavingQueryPanel());
$response->addHTML($databaseDesigner->getAggregateQueryPanel());
$response->addHTML($databaseDesigner->getWhereQueryPanel());
$response->addHTML($databaseDesigner->getQueryDetails($_GET['db']));

$response->addHTML('<div id="PMA_disable_floating_menubar"></div>');
14 changes: 12 additions & 2 deletions js/db_multi_table_query.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,22 @@ AJAX.registerOnload('db_multi_table_query.js', function () {
}

query = 'SELECT ';
query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`';
if(columns[0][1] === '*'){
query += '`' + escapeBacktick(columns[0][0]) + '`.' + escapeBacktick(columns[0][1]) + '';
}
else{
query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`';
}
if (columns[0][2] !== '') {
query += ' AS ' + columns[0][2];
}
for (var i = 1; i < columns.length; i++) {
query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`';
if(columns[i][1] === '*'){
query += ', `' + escapeBacktick(columns[i][0]) + '`.' + escapeBacktick(columns[i][1]) + '';
}
else{
query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`';
}
if (columns[i][2] !== '') {
query += ' AS `' + escapeBacktick(columns[0][2]) + '`';
}
Expand Down
1 change: 1 addition & 0 deletions templates/columns_definitions/column_attributes.twig
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
column_meta['Collation'] is not empty ? column_meta['Collation'] : null,
false
) }}
{% set ci = ci + 1 %}
</td>
<td class="center">
{# column attribute #}
Expand Down