p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes

This commit is contained in:
Itay Mizeretz 2017-10-04 14:07:38 +03:00
parent d7ce6c2293
commit 4625378737
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey_island/cc/resources/local_run.py
View File

@ -61,7 +61,7 @@ class LocalRun(flask_restful.Resource):
body = json.loads(request.data) body = json.loads(request.data)
if body.get('action') == 'run': if body.get('action') == 'run':
local_run = run_local_monkey() 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 # default action
return make_response({'error': 'Invalid action'}, 500) return make_response({'error': 'Invalid action'}, 500)

2
monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
View File

@ -112,7 +112,7 @@ class RunMonkeyPageComponent extends React.Component {
renderIconByState(state) { renderIconByState(state) {
if (state === 'running') { if (state === 'running') {
return <Icon name="check" className="text-success" style={{'marginLeft': '5px'}}/> return <Icon name="check" className="text-success" style={{'marginLeft': '5px'}}/>
} else if (state == 'installing') { } else if (state === 'installing') {
return <Icon name="refresh" className="text-success" style={{'marginLeft': '5px'}}/> return <Icon name="refresh" className="text-success" style={{'marginLeft': '5px'}}/>
} else { } else {
return ''; return '';