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

Move designer config to javascript w/json

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2018-06-09 15:48:52 +02:00
parent 482c7bc3ca
commit 096d170e04
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/designer/init.js
View File

@ -23,17 +23,16 @@ AJAX.registerOnload('designer/init.js', function () {
$('#ab').accordion('refresh');
return false;
});
var tables_data = JSON.parse($('#script_tables').html());
j_tabs = tables_data.j_tabs;
h_tabs = tables_data.h_tabs;
contr = JSON.parse($('#script_contr').html());
display_field = JSON.parse($('#script_display_field').html());
j_tabs = designer_config.scriptTables.j_tabs;
h_tabs = designer_config.scriptTables.h_tabs;
contr = designer_config.scriptContr;
display_field = designer_config.scriptDisplayField;
server = $('#script_server').html();
db = $('#script_db').html();
selected_page = $('#script_display_page').html() === '' ? '-1' : $('#script_display_page').html();
designer_tables_enabled = $('#designer_tables_enabled').html() === '1';
server = designer_config.server;
db = designer_config.db;
selected_page = designer_config.displayPage;
designer_tables_enabled = designer_config.tablesEnabled;
Main();

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

@ -360,15 +360,21 @@ class Designer
}
}
}
$designerConfig = new \stdClass();
$designerConfig->db = $db;
$designerConfig->scriptTables = $scriptTables;
$designerConfig->scriptContr = $scriptContr;
$designerConfig->server = $GLOBALS['server'];
$designerConfig->scriptDisplayField = $scriptDisplayField;
$designerConfig->displayPage = ($displayPage === '' ? '-1' : $displayPage);
$designerConfig->tablesEnabled = $cfgRelation['pdfwork'];
return Template::get('database/designer/main')->render([
'server' => $GLOBALS['server'],
'db' => $db,
'get_db' => $getDb,
'script_tables' => json_encode($scriptTables),
'script_contr' => json_encode($scriptContr),
'script_display_field' => json_encode($scriptDisplayField),
'designer_config'=> json_encode($designerConfig),
'display_page' => $displayPage,
'relation_pdfwork' => $cfgRelation['pdfwork'],
'has_query' => $hasQuery,
'selected_page' => $selectedPage,
'params_array' => $paramsArray,

10
templates/database/designer/main.twig
View File

@ -1,12 +1,8 @@
{# Invisible characters will make javascript crash #}
{% spaceless %}
<div id="script_server" class="hide">{{ server }}</div>
<div id="script_db" class="hide">{{ db }}</div>
<div id="script_tables" class="hide">{{ script_tables }}</div>
<div id="script_contr" class="hide">{{ script_contr }}</div>
<div id="script_display_field" class="hide">{{ script_display_field }}</div>
<div id="script_display_page" class="hide">{{ display_page }}</div>
<div id="designer_tables_enabled" class="hide">{{ relation_pdfwork }}</div>
<script type="text/javascript">
var designer_config = {{ designer_config | raw }};
</script>
{% endspaceless %}
{# side menu #}