Return-Path: 
 <commits-return-18831-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 82E47FEF1
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu,  2 May 2013 17:31:20 +0000 (UTC)
Received: (qmail 94327 invoked by uid 500); 2 May 2013 17:31:09 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 94260 invoked by uid 500); 2 May 2013 17:31:09 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 93420 invoked by uid 99); 2 May 2013 17:31:08 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 17:31:08 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C22D08261B1; Thu,  2 May 2013 17:31:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 02 May 2013 17:31:53 -0000
Message-Id: <3d0a514d1bb946bcba81793438752131@git.apache.org>
In-Reply-To: <67802977535549f99258d2d06cef174c@git.apache.org>
References: <67802977535549f99258d2d06cef174c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [47/50] git commit: updated refs/heads/ui-cisco-asa1000v-support to
 ac07a54

Widget change to incorporate VM state while adding a load balancer rule


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba9feabe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba9feabe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba9feabe

Branch: refs/heads/ui-cisco-asa1000v-support
Commit: ba9feabe8c5d5e4bc4634597f62caba520bbd1f6
Parents: 4933533
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Thu May 2 21:02:51 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Thu May 2 21:02:51 2013 +0530

----------------------------------------------------------------------
 ui/scripts/ui/widgets/multiEdit.js |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9feabe/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 27b14d1..59e85bf 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -653,6 +653,11 @@
           });
         });
 
+        var itemState=multiRule._itemState ? item[multiRule._itemState] :item.state;
+        var $itemState = $('<span>').html(_s(itemState));
+        $tr.append($('<td>').addClass('state').appendTo($tr).append("VM State - ").append($itemState));
+
+
         if (itemActions) {
           var $itemActions = $('<td>').addClass('actions item-actions');