diff --git a/src/sunstone/public/app/tabs/backupjob-tab/utils/status.js b/src/sunstone/public/app/tabs/backupjob-tab/utils/status.js index ea7b78c877..ea7a7b93a0 100644 --- a/src/sunstone/public/app/tabs/backupjob-tab/utils/status.js +++ b/src/sunstone/public/app/tabs/backupjob-tab/utils/status.js @@ -40,10 +40,13 @@ define(function(require) { return lastBackup === '0'? "Not started yet" : "Completed" } - if(haveValues(outdatedVms) || haveValues(backinUpVms)){ + if(haveValues(outdatedVms)){ return "Completed" } + if(haveValues(backinUpVms)){ + return "On Going" + } } return { diff --git a/src/sunstone/public/app/utils/schedule_action.js b/src/sunstone/public/app/utils/schedule_action.js index 4eb7960752..0c99c17561 100644 --- a/src/sunstone/public/app/utils/schedule_action.js +++ b/src/sunstone/public/app/utils/schedule_action.js @@ -296,7 +296,12 @@ define(function (require) { //input hour picker schedule.find("#time_input",context).off("click").on("click",function(e){ e.stopPropagation(); - }).wickedpicker(options_hour_picker); + }).wickedpicker(options_hour_picker).removeAttr("onkeypress").on('keypress', function(e) { + var key = String.fromCharCode(e.which); + if (!/[\d:]/.test(key) && e.which !== 8) { + e.preventDefault(); + } + }); schedule.find("#relative_time", context).off("click").on("click", function (e) { $("#schedule_type", context).prop("checked", false);