From 46253787370a25ee5edf516f7b1e4a427ee82d00 Mon Sep 17 00:00:00 2001 From: Itay Mizeretz Date: Wed, 4 Oct 2017 14:07:38 +0300 Subject: [PATCH] minor fixes --- monkey_island/cc/resources/local_run.py | 2 +- monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monkey_island/cc/resources/local_run.py b/monkey_island/cc/resources/local_run.py index ed8949501..2fe7be3d1 100644 --- a/monkey_island/cc/resources/local_run.py +++ b/monkey_island/cc/resources/local_run.py @@ -61,7 +61,7 @@ class LocalRun(flask_restful.Resource): body = json.loads(request.data) if body.get('action') == 'run': local_run = run_local_monkey() - return jsonify(is_running=local_run[0]) + return jsonify(is_running=local_run[0], error_text=local_run[1]) # default action return make_response({'error': 'Invalid action'}, 500) diff --git a/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js b/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js index d84fe6c1f..ab462a713 100644 --- a/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js +++ b/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js @@ -112,7 +112,7 @@ class RunMonkeyPageComponent extends React.Component { renderIconByState(state) { if (state === 'running') { return - } else if (state == 'installing') { + } else if (state === 'installing') { return } else { return '';