Permalink
Browse files

Merge branch 'maint/3.2/master' into maint/3.2/security

  • Loading branch information...
2 parents 740a8a3 + 551a6ef commit 822b24b6c3755332eebbdfef067de0cbdc0cae65 @viglesiasce viglesiasce committed Feb 5, 2013
Showing with 4 additions and 1 deletion.
  1. +4 −1 console/static/js/instance.js
@@ -321,7 +321,10 @@
$.each(selectedRows, function(rowIdx, row){
$.each(row, function(key, val){
instIds.push(row['id'].toLowerCase());
- if(key==='state') {
+ if(key==='state' || key=='_state') {
+ if (key=='_state') {
+ val = val.name;
+ }
if(!stateMap[val])
stateMap[val] = [row['id'].toLowerCase()];
else

0 comments on commit 822b24b

Please sign in to comment.