diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js index c4f6aa5..2771ec1 100644 --- a/circle/dashboard/static/dashboard/vm-details.js +++ b/circle/dashboard/static/dashboard/vm-details.js @@ -215,7 +215,7 @@ function checkNewActivity(only_state, runs) { } $("#vm-details-state i").prop("class", data['icon']); - $("#vm-details-state span").html(data['state']); + $("#vm-details-state span").html(data['state'].toUpperCase()); if(data['state'] == "RUNNING") { $("[data-target=#_console]").attr("data-toggle", "pill").attr("href", "#console").parent("li").removeClass("disabled"); } else { diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py index 8513a02..d8f1297 100644 --- a/circle/dashboard/views.py +++ b/circle/dashboard/views.py @@ -1615,7 +1615,7 @@ def vm_activity(request, pk): response = {} only_state = request.GET.get("only_state") - response['state'] = instance.state + response['state'] = instance.get_status_display() response['icon'] = instance.get_status_icon() if only_state is not None and only_state == "false": # instance activity context = {