Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeven Bansod <devenbansod.bits@gmail.com>2015-02-21 18:04:19 +0300
committerDeven Bansod <devenbansod.bits@gmail.com>2015-02-22 20:22:47 +0300
commit42d5a90f2f35ac3036c934d458e9069947b87bc4 (patch)
tree504cd7da1ad06661635a562d92206f9c36ecf158 /js/server_status_processes.js
parent127ba15547a6c2c347227d0fb1af6db7d4a80549 (diff)
Add Filter to Process List | Feature #1606
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
Diffstat (limited to 'js/server_status_processes.js')
-rw-r--r--js/server_status_processes.js44
1 files changed, 30 insertions, 14 deletions
diff --git a/js/server_status_processes.js b/js/server_status_processes.js
index 4e398982a9..017735fcfb 100644
--- a/js/server_status_processes.js
+++ b/js/server_status_processes.js
@@ -86,20 +86,20 @@ var processList = {
// if auto refresh is enabled
if (processList.autoRefresh) {
var interval = parseInt(processList.refreshInterval, 10) * 1000;
- processList.refreshRequest = $.get(processList.refreshUrl, {
- 'ajax_request': true,
- 'refresh': true
- }, function(data) {
- if (data.hasOwnProperty('success') && data.success) {
- $newTable = $(data.message);
- $('#tableprocesslist').html($newTable.html());
- PMA_highlightSQL($('#tableprocesslist'));
- }
- processList.refreshTimeout = setTimeout(
- processList.refresh,
- interval
- );
- });
+ var urlParams = processList.getUrlParams();
+ processList.refreshRequest = $.get(processList.refreshUrl,
+ urlParams,
+ function(data) {
+ if (data.hasOwnProperty('success') && data.success) {
+ $newTable = $(data.message);
+ $('#tableprocesslist').html($newTable.html());
+ PMA_highlightSQL($('#tableprocesslist'));
+ }
+ processList.refreshTimeout = setTimeout(
+ processList.refresh,
+ interval
+ );
+ });
}
},
@@ -131,6 +131,22 @@ var processList = {
processList.refresh();
}
$('a#toggleRefresh').html(PMA_getImage(img) + escapeHtml(label));
+ },
+
+ /**
+ * Return the Url Parameters
+ * for autorefresh request,
+ * includes showExecuting if the filter is checked
+ *
+ * @return urlParams - url parameters with autoRefresh request
+ */
+ getUrlParams: function() {
+ var urlParams = { 'ajax_request': true, 'refresh': true };
+ if ($('#showExecuting').is(":checked")) {
+ urlParams['showExecuting'] = true;
+ return urlParams;
+ }
+ return urlParams;
}
};