From d1e3237e2e3e72d396a9be4b45cd9b8b799d2444 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Mon, 16 May 2016 19:50:49 +0530 Subject: [PATCH] Fixed misc issues --- .../misc/file_manager/templates/file_manager/js/utility.js | 3 ++- web/pgadmin/static/css/overrides.css | 2 +- .../tools/maintenance/templates/maintenance/js/maintenance.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js index 90327be72..f0b45ac2b 100755 --- a/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js +++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js @@ -1370,7 +1370,8 @@ var enab_dis_level_up = function() { // Get transaction id to generate request url and // to generate config files on runtime var transId = getTransId(), - t_id = ''; + t_id = '', + t_res; if (transId.readyState == 4) { t_res = JSON.parse(transId.responseText); diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css index d841b9320..711e14529 100755 --- a/web/pgadmin/static/css/overrides.css +++ b/web/pgadmin/static/css/overrides.css @@ -264,7 +264,7 @@ iframe { } .obj_properties fieldset > div > .pgadmin-control-group > label { - height: 30px; + min-height: 28px; } .obj_properties fieldset > .fieldset-content { diff --git a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js index cc22af977..40d626a1d 100644 --- a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js +++ b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js @@ -231,7 +231,7 @@ define( method: 'POST', data:{ 'data': JSON.stringify(args) }, success: function(res) { - if (res.data.status) { + if (res.data && res.data.status) { //Do nothing as we are creating the job and exiting from the main dialog Alertify.success(res.data.info); pgBrowser.Events.trigger('pgadmin-bgprocess:created', self);