IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add missing "Run Now" option for pgAdmin jobs. Fixes #1796

Browse Source
This commit is contained in:
Neel Patel
2017-03-06 10:24:43 +00:00
committed by Dave Page
parent 523cd6f34a
commit 278c64c361
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/pgagent/__init__.py
View File

@@ -121,7 +121,7 @@ class JobView(PGChildNodeView):
'nodes': [{'get': 'nodes'}, {'get': 'nodes'}],
'sql': [{'get': 'sql'}],
'msql': [{'get': 'msql'}, {'get': 'msql'}],
'run_now': [{'post': 'run_now'}],
'run_now': [{'put': 'run_now'}],
'classes': [{}, {'get': 'job_classes'}],
'children': [{'get': 'children'}],
'stats': [{'get': 'statistics'}],

48
web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js
View File

@@ -52,6 +52,11 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
applies: ['object', 'context'], callback: 'show_obj_properties',
category: 'create', priority: 4, label: '{{ _('pgAgent Job...') }}',
icon: 'wcTabIcon icon-pga_job', data: {action: 'create'}
}, {
name: 'run_now_pga_job', node: 'pga_job', module: this,
applies: ['object', 'context'], callback: 'run_pga_job_now',
priority: 4, label: '{{ _('Run now') }}', data: {action: 'create'},
icon: 'fa fa-play-circle'
}]);
},
model: pgBrowser.Node.Model.extend({
@@ -154,7 +159,48 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
}
return null;
}
})
}),
/* Run pgagent job now */
run_pga_job_now: function(args) {
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined;
if (!d)
return false;
$.ajax({
url: obj.generate_url(i, 'run_now', d, true),
method:'PUT',
success: function(res) {
// 'pgagent.pga_job' table updated with current time
// to run the job now.
t.unload(i);
},
error: function(xhr, status, error) {
var error_msg = "Unable to run pgagent job.";
if (xhr.readyState == 0) {
alertify.error('{{ _('Not connected to the server or the connection to the server has been closed.') }}');
}
else {
if (_.isUndefined(xhr.responseText)) {
alertify.error("{{ _('" + error_msg + "') }}");
}
else {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error("{{ _('" + err.errormsg + "') }}");
}
}
}
t.unload(i);
}
});
return false;
},
});
}