This commit is contained in:

committed by
Michal Čihař

parent
5ecbd6941d
commit
86ca31197b
@@ -57,6 +57,7 @@ $Id$
|
|||||||
+ patch #2967320 [designer] Colored relations based on the primary key,
|
+ patch #2967320 [designer] Colored relations based on the primary key,
|
||||||
thanks to GreenRover - greenrover
|
thanks to GreenRover - greenrover
|
||||||
- [core] Provide way for vendors to easily change paths to config files.
|
- [core] Provide way for vendors to easily change paths to config files.
|
||||||
|
+ patch #2979922, rfe #2804874 [interface] Add inline query editing, thanks to Muhammd Adnan.
|
||||||
|
|
||||||
3.3.2.0 (not yet released)
|
3.3.2.0 (not yet released)
|
||||||
- patch #2969449 [core] Name for MERGE engine varies depending on the
|
- patch #2969449 [core] Name for MERGE engine varies depending on the
|
||||||
|
@@ -1654,3 +1654,25 @@ function changeMIMEType(db, table, reference, mime_type)
|
|||||||
var chgRequest = new Request({ method: 'post', url: mime_chg_url, data: params, evalScripts: true });
|
var chgRequest = new Request({ method: 'post', url: mime_chg_url, data: params, evalScripts: true });
|
||||||
chgRequest.send();
|
chgRequest.send();
|
||||||
}
|
}
|
||||||
|
// Jquery Coding for inline editing SQL_QUERY
|
||||||
|
$(document).ready(function(){
|
||||||
|
var $oldText,$db,$table,$token,$sql_query;
|
||||||
|
$oldText=$(".syntax").html();
|
||||||
|
$("#inline_edit").click(function(){
|
||||||
|
$db=$("input[name='db']").val();
|
||||||
|
$table=$("input[name='table']").val();
|
||||||
|
$token=$("input[name='token']").val();
|
||||||
|
$sql_query=$("input[name='sql_query']").val();
|
||||||
|
|
||||||
|
$(".syntax").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ $sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"Save\"><input type=\"button\" id=\"btnDiscard\" value=\"Discard\">");
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#btnSave").live("click",function(){
|
||||||
|
window.location.replace("import.php?db="+$db+"&table="+$table+"&sql_query="+$("#sql_query_edit").val()+"&show_query=1&token="+$token+"");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#btnDiscard").live("click",function(){
|
||||||
|
$(".sql").html("<span class=\"syntax\">"+$oldText+"</span>");
|
||||||
|
});
|
||||||
|
});
|
@@ -1270,7 +1270,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
|||||||
if (! empty($refresh_link)) {
|
if (! empty($refresh_link)) {
|
||||||
PMA_profilingCheckbox($sql_query);
|
PMA_profilingCheckbox($sql_query);
|
||||||
}
|
}
|
||||||
echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
|
$inline_edit="<script language=\"javascript\">document.write('[<a href=\"#\" title=\"Click here to Inline Edit Your SQL Query.\" id=\"inline_edit\">Inline</a>]');</script>";
|
||||||
|
echo $inline_edit . $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
echo '</div><br />' . "\n";
|
echo '</div><br />' . "\n";
|
||||||
|
@@ -981,7 +981,11 @@ textarea#sqlquery {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
/* height: 100%; */
|
/* height: 100%; */
|
||||||
}
|
}
|
||||||
|
textarea#sql_query_edit{
|
||||||
|
height:7em;
|
||||||
|
width: 95%;
|
||||||
|
display:block;
|
||||||
|
}
|
||||||
div#queryboxcontainer div#bookmarkoptions {
|
div#queryboxcontainer div#bookmarkoptions {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
}
|
}
|
||||||
|
@@ -929,7 +929,11 @@ textarea#sqlquery {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
/* height: 100%; */
|
/* height: 100%; */
|
||||||
}
|
}
|
||||||
|
textarea#sql_query_edit{
|
||||||
|
height:7em;
|
||||||
|
width: 95%;
|
||||||
|
display:block;
|
||||||
|
}
|
||||||
div#queryboxcontainer div#bookmarkoptions {
|
div#queryboxcontainer div#bookmarkoptions {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user