diff --git a/src/js/terminal.js b/src/js/terminal.js index aea36932c..45ffa9849 100644 --- a/src/js/terminal.js +++ b/src/js/terminal.js @@ -18,6 +18,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client $scope.restartAppBusy = false; $scope.appBusy = false; $scope.selectedAppInfo = null; + $scope.schedulerTasks = []; $scope.downloadFile = { error: '', @@ -240,6 +241,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client } $scope.selectedAppInfo = result; + $scope.schedulerTasks = result.manifest.addons.scheduler ? Object.keys(result.manifest.addons.scheduler).map(function (k) { return { name: k, command: result.manifest.addons.scheduler[k].command }; }) : []; $scope.terminal = new Terminal(); $scope.terminal.open(document.querySelector('#terminalContainer')); @@ -271,7 +273,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client }); } - $scope.terminalInject = function (addon) { + $scope.terminalInject = function (addon, extra) { if (!$scope.terminalSocket) return; var cmd; @@ -279,6 +281,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client else if (addon === 'postgresql') cmd = 'PGPASSWORD=${POSTGRESQL_PASSWORD} psql -h ${POSTGRESQL_HOST} -p ${POSTGRESQL_PORT} -U ${POSTGRESQL_USERNAME} -d ${POSTGRESQL_DATABASE}'; else if (addon === 'mongodb') cmd = 'mongo -u "${MONGODB_USERNAME}" -p "${MONGODB_PASSWORD}" ${MONGODB_HOST}:${MONGODB_PORT}/${MONGODB_DATABASE}'; else if (addon === 'redis') cmd = 'redis-cli -h "${REDIS_HOST}" -p "${REDIS_PORT}" -a "${REDIS_PASSWORD}"'; + else if (addon === 'scheduler' && extra) cmd = extra.command; if (!cmd) return; diff --git a/src/terminal.html b/src/terminal.html index 2119b0400..c07eede37 100644 --- a/src/terminal.html +++ b/src/terminal.html @@ -126,6 +126,15 @@