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

bug #4902 Designer: Loading does not work

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-05-14 14:16:41 +05:30
parent ef806b39e5
commit 35c7c6019e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- bug Escape database and table names for partition maintenance
- bug Invalid value for CURLOPT_SSL_VERIFYPEER
- bug #4367 Import status infinite loop
- bug #4902 Designer: Loading does not work
4.4.6.1 (2015-05-13)
- bug #4899 [security] CSRF vulnerability in setup

15
js/pmd/designer_page.js
View File

@ -104,7 +104,7 @@ function Show_new_page_tables(check)
}
}
selected_page = -1;
$("#top_menu #page_name").text(PMA_messages.strUntitled);
$("#name-panel #page_name").text(PMA_messages.strUntitled);
MarkUnsaved();
}
@ -112,7 +112,7 @@ function Load_HTML_for_page(page_id)
{
Show_new_page_tables(false);
Load_page_objects(page_id, function (page, tbl_cords) {
$("#top_menu #page_name").text(page.page_descr);
$("#name-panel #page_name").text(page.page_descr);
MarkSaved();
for (var t = 0; t < tbl_cords.length; t++) {
var tb_id = db + '.' + tbl_cords[t].table_name;
@ -132,14 +132,17 @@ function Load_page_objects(page_id, callback)
{
DesignerOfflineDB.loadObject('pdf_pages', page_id, function (page) {
var tbl_cords = [];
for (var i = 0; i < page.tbl_cords.length; i++) {
var count = page.tbl_cords.length;
for (var i = 0; i < count; i++) {
DesignerOfflineDB.loadObject('table_coords', page.tbl_cords[i], function (tbl_cord) {
tbl_cords.push(tbl_cord);
if (tbl_cords.length == count) {
if (typeof callback !== 'undefined') {
callback(page, tbl_cords);
}
}
});
}
if (typeof callback !== 'undefined') {
callback(page, tbl_cords);
}
});
}