Skip to content

Commit

Permalink
Use db_desginer.php as a route for all designer operation. Combine pm…
Browse files Browse the repository at this point in the history 
…d_general.lib.php and designer.lib.php into db_designer.lib.php

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
  • Loading branch information
@kb-yashodha
kb-yashodha committed Aug 14, 2014
1 parent 7e1f1d2 commit 285c18a
Show file tree
Hide file tree
Showing 15 changed files with 461 additions and 629 deletions.
41 changes: 31 additions & 10 deletions pmd_general.php → db_designer.php
View file
Expand Up @@ -6,12 +6,9 @@
* @package PhpMyAdmin-Designer
*/

/**
*
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/pmd_common.php';
require_once 'libraries/pmd_general.lib.php';
require_once 'libraries/db_designer.lib.php';

$script_display_field = PMA_getTablesInfo();
$tab_column = PMA_getColumnsInfo();
Expand All @@ -24,11 +21,10 @@

if (isset($_REQUEST['dialog'])) {

include_once 'libraries/designer.lib.php';
if ($_REQUEST['dialog'] == 'edit') {
$html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'edit');
$html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'editPage');
} else if ($_REQUEST['dialog'] == 'delete') {
$html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'delete');
$html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'deletePage');
} else if ($_REQUEST['dialog'] == 'save_as') {
$html = PMA_getHtmlForPageSaveAs($GLOBALS['db']);
} else if ($_REQUEST['dialog'] == 'export') {
Expand All @@ -44,14 +40,14 @@

if (isset($_REQUEST['operation'])) {

if ($_REQUEST['operation'] == 'delete') {
if ($_REQUEST['operation'] == 'deletePage') {
$result = PMA_deletePage($_REQUEST['selected_page']);
if ($result) {
$response->isSuccess(true);
} else {
$response->isSuccess(false);
}
} elseif ($_REQUEST['operation'] == 'save') {
} elseif ($_REQUEST['operation'] == 'savePage') {
if ($_REQUEST['save_page'] == 'same') {
$page = $_REQUEST['selected_page'];
} elseif ($_REQUEST['save_page'] == 'new') {
Expand All @@ -63,6 +59,31 @@
} else {
$response->isSuccess(false);
}
} elseif ($_REQUEST['operation'] == 'setDisplayField') {
PMA_saveDisplayField(
$_REQUEST['db'], $_REQUEST['table'], $_REQUEST['field']
);
$response->isSuccess(true);
} elseif ($_REQUEST['operation'] == 'addNewRelation') {
list($success, $message) = PMA_addNewRelation(
$_REQUEST['db'],
$_REQUEST['T1'],
$_REQUEST['F1'],
$_REQUEST['T2'],
$_REQUEST['F2'],
$_REQUEST['on_delete'],
$_REQUEST['on_update']
);
$response->isSuccess($success);
$response->addJSON($success ? 'message' : 'error', $message);
} elseif ($_REQUEST['operation'] == 'removeRelation') {
PMA_removeRelation(
$_REQUEST['T1'],
$_REQUEST['F1'],
$_REQUEST['T2'],
$_REQUEST['F2']
);
$response->isSuccess(true);
}
return;
} else {
Expand All @@ -86,12 +107,12 @@
$response->getFooter()->setMinimal();
$header = $response->getHeader();
$header->setBodyId('pmd_body');

$scripts = $header->getScripts();
$scripts->addFile('jquery/jquery.fullscreen.js');
$scripts->addFile('pmd/designer_db.js');
$scripts->addFile('pmd/designer_objects.js');
$scripts->addFile('pmd/designer_page.js');
$scripts->addFile('pmd/ajax.js');
$scripts->addFile('pmd/history.js');
$scripts->addFile('pmd/move.js');
$scripts->addFile('pmd/iecanvas.js', true);
Expand Down
2 changes: 1 addition & 1 deletion db_qbe.php
View file
Expand Up @@ -112,7 +112,7 @@
* Displays the Query by example form
*/
if ($cfgRelation['pdfwork']) {
$url = 'pmd_general.php' . PMA_URL_getCommon(
$url = 'db_designer.php' . PMA_URL_getCommon(
array_merge(
$url_params,
array('query' => 1)
Expand Down
1 change: 1 addition & 0 deletions js/messages.php
View file
Expand Up @@ -405,6 +405,7 @@
$js_messages['strLeavingPage'] = __('Do you want to save the changes to the current page?');
$js_messages['strSuccessfulPageDelete'] = __('Successfully deleted the page');
$js_messages['strExportRelationalSchema'] = __('Export relational schema');
$js_messages['strModificationSaved'] = __('Modifications have been saved');

/* Visual query builder (js/pmd/move.js) */
$js_messages['strAddOption'] = __('Add an option for column "%s".');
Expand Down
60 changes: 0 additions & 60 deletions js/pmd/ajax.js
View file

This file was deleted.

80 changes: 59 additions & 21 deletions js/pmd/move.js
View file
Expand Up @@ -566,14 +566,24 @@ function Get_url_pos()

function Save2(callback)
{
_change = 0;
if (pmd_tables_enabled) {
var poststr = 'IS_AJAX=1&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=1&selected_page=' + selected_page;
var poststr = '&operation=savePage&save_page=same&ajax_request=true';
poststr += '&server=' + server + '&db=' + db + '&token=' + token + '&selected_page=' + selected_page;
poststr += Get_url_pos();
makeRequest('pmd_save_pos.php', poststr);
if (typeof callback !== 'undefined') {
callback();
}

var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php', poststr, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
PMA_ajaxRemoveMessage($msgbox);
PMA_ajaxShowMessage(PMA_messages.strModificationSaved);
_change = 0;
if (typeof callback !== 'undefined') {
callback();
}
}
});
} else {
var name = $("#page_name").html().trim();
Save_to_selected_page(db, selected_page, name, Get_url_pos(), function (page){
Expand Down Expand Up @@ -634,10 +644,10 @@ function Save3(callback)
$(this).dialog('close');
};

var $form = $('<form action="pmd_general.php" method="post" name="save_page" id="save_page" class="ajax"></form>')
var $form = $('<form action="db_designer.php" method="post" name="save_page" id="save_page" class="ajax"></form>')
.append('<input type="hidden" name="db" value="' + db + '" />')
.append('<input type="hidden" name="token" value="' + token + '" />')
.append('<input type="hidden" name="operation" value="save" />')
.append('<input type="hidden" name="operation" value="savePage" />')
.append('<input type="hidden" name="save_page" value="new" />')
.append('<label for="selected_value">' + PMA_messages.strPageName
+ '</label>:<input type="text" name="selected_value" />');
Expand Down Expand Up @@ -677,7 +687,7 @@ function Edit_pages()

var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=edit&token=' + token + '&db=' + db;
$.get("pmd_general.php", params, function (data) {
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
Expand All @@ -703,6 +713,7 @@ function Edit_pages()
}); // end $.get()
});
}

// ----------------------------- DELETE PAGES ---------------------------------------
function Delete_pages()
{
Expand Down Expand Up @@ -755,7 +766,7 @@ function Delete_pages()

var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=delete&token=' + token + '&db=' + db;
$.get("pmd_general.php", params, function (data) {
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
Expand Down Expand Up @@ -853,7 +864,7 @@ function Save_as()

var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=save_as&token=' + token + '&db=' + db;
$.get("pmd_general.php", params, function (data) {
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
Expand Down Expand Up @@ -931,7 +942,7 @@ function Export_pages()
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=export&token=' + token + '&db=' + db + '&selected_page=' + selected_page;
$.get("pmd_general.php", params, function (data) {
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
Expand Down Expand Up @@ -980,7 +991,7 @@ function Load_page(page) {
if (page !== null) {
param_page = '&page=' + page;
}
$('<a href="pmd_general.php?db=' + db + '&token=' + token + param_page + '"></a>')
$('<a href="db_designer.php?db=' + db + '&token=' + token + param_page + '"></a>')
.appendTo($('#page_content'))
.click();
} else {
Expand Down Expand Up @@ -1091,19 +1102,37 @@ function Click_field(T, f, PK) // table field
document.getElementById('pmd_hint').innerHTML = "";
document.getElementById('pmd_hint').style.display = 'none';
document.getElementById('display_field_button').className = 'M_butt';
makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token);

var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php',
{operation: 'setDisplayField', ajax_request: true, server: server, token: token, db: db, table: T, field: f},
function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
PMA_ajaxRemoveMessage($msgbox);
PMA_ajaxShowMessage(PMA_messages.strModificationSaved);
}
});
}
}

function New_relation()
{
document.getElementById('layer_new_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += Get_url_pos();
link_relation += '&operation=addNewRelation&ajax_request=true';

//alert(link_relation);
makeRequest('pmd_relation_new.php', link_relation);
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php', link_relation, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
PMA_ajaxRemoveMessage($msgbox);
Load_page(selected_page);
}
}); // end $.post()
}

//-------------------------- create tables -------------------------------------
Expand Down Expand Up @@ -1305,9 +1334,18 @@ function Canvas_click(id)
function Upd_relation()
{
document.getElementById('layer_upd_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += Get_url_pos();
makeRequest('pmd_relation_upd.php', link_relation);
link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
link_relation += '&operation=removeRelation&ajax_request=true';

var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php', link_relation, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
} else {
PMA_ajaxRemoveMessage($msgbox);
Load_page(selected_page);
}
}); // end $.post()
}

function VisibleTab(id, t_n)
Expand Down
2 changes: 1 addition & 1 deletion libraries/Menu.class.php
View file
Expand Up @@ -480,7 +480,7 @@ private function _getDbTabs()
if (! $db_is_system_schema) {
$tabs['designer']['text'] = __('Designer');
$tabs['designer']['icon'] = 'b_relations.png';
$tabs['designer']['link'] = 'pmd_general.php';
$tabs['designer']['link'] = 'db_designer.php';
$tabs['designer']['id'] = 'designer_tab';
}

Expand Down

0 comments on commit 285c18a

Please sign in to comment.