bug #1718787 Multi-server setup breaks Designer

This commit is contained in:
Marc Delisle
2007-05-26 18:31:40 +00:00
parent baaaa7eaad
commit 043890ac71
3 changed files with 6 additions and 4 deletions

View File

@@ -19,6 +19,7 @@ $HeadURL$
thanks to Gordon McNaughton thanks to Gordon McNaughton
- bug #1715709 export in SQL format always includes procedures and functions - bug #1715709 export in SQL format always includes procedures and functions
- bug #1722502 DROP TABLE in export view structure - bug #1722502 DROP TABLE in export view structure
- bug #1718787 Multi-server setup breaks Designer
2.10.1.0 (2007-04-23) 2.10.1.0 (2007-04-23)
===================== =====================

View File

@@ -373,7 +373,7 @@ function Get_url_pos()
function Save2() function Save2()
{ {
var poststr = 'IS_AJAX=1&db='+db+'&token='+token+'&die_save_pos=1'; var poststr = 'IS_AJAX=1&server='+server+'&db='+db+'&token='+token+'&die_save_pos=1';
poststr += Get_url_pos(); poststr += Get_url_pos();
makeRequest('pmd_save_pos.php', poststr); makeRequest('pmd_save_pos.php', poststr);
} }
@@ -486,14 +486,14 @@ function Click_field(T,f,PK) // table field
document.getElementById('hint').innerHTML = ""; document.getElementById('hint').innerHTML = "";
document.getElementById('hint').style.visibility = "hidden"; document.getElementById('hint').style.visibility = "hidden";
document.getElementById('display_field_button').className = 'M_butt'; document.getElementById('display_field_button').className = 'M_butt';
makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&db=' + db + '&token=' + token ); makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token );
} }
} }
function New_relation() function New_relation()
{ {
document.getElementById('layer_new_relation').style.visibility = 'hidden'; document.getElementById('layer_new_relation').style.visibility = 'hidden';
link_relation += '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += Get_url_pos(); link_relation += Get_url_pos();
@@ -651,7 +651,7 @@ function Canvas_click(id)
function Upd_relation() function Upd_relation()
{ {
document.getElementById('layer_upd_relation').style.visibility = 'hidden'; document.getElementById('layer_upd_relation').style.visibility = 'hidden';
link_relation += '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += Get_url_pos(); link_relation += Get_url_pos();
makeRequest('pmd_relation_upd.php', link_relation); makeRequest('pmd_relation_upd.php', link_relation);
} }

View File

@@ -32,6 +32,7 @@ $hidden = "hidden";
<?php <?php
echo ' echo '
<script> <script>
var server = "' . $server . '";
var db = "' . $db . '"; var db = "' . $db . '";
var token = "' . $token . '"; var token = "' . $token . '";
var LangSelectReferencedKey = "' . $strSelectReferencedKey . '"; var LangSelectReferencedKey = "' . $strSelectReferencedKey . '";