Return-Path: 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 ACF7310CBC for ; Thu, 3 Oct 2013 06:10:28 +0000 (UTC) Received: (qmail 71596 invoked by uid 500); 3 Oct 2013 06:07:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71142 invoked by uid 500); 3 Oct 2013 06:06:20 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71068 invoked by uid 99); 3 Oct 2013 06:06:04 -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, 03 Oct 2013 06:06:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6A10A90E365; Thu, 3 Oct 2013 06:06:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: animesh@apache.org To: commits@cloudstack.apache.org Date: Thu, 03 Oct 2013 06:06:23 -0000 Message-Id: In-Reply-To: <984152840fcc4b4d8281860a13c07d29@git.apache.org> References: <984152840fcc4b4d8281860a13c07d29@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] git commit: updated refs/heads/4.2 to 86c9363 CLOUDSTACK-2180: UI > Instances ? Reboot VM action > if the template from which vm is created is password-enabled, pop up "Password has been reset to xxxxxxx" dialog after action is complete. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35e50761 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35e50761 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35e50761 Branch: refs/heads/4.2 Commit: 35e50761562fc558ec7e272cc7dbd1cff564d356 Parents: 38bbfdc Author: Jessica Wang Authored: Mon Sep 23 11:57:10 2013 -0700 Committer: Jessica Wang Committed: Mon Sep 23 11:58:21 2013 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35e50761/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index cf8aca5..a9f6d1c 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -458,6 +458,12 @@ }, notification: function(args) { return 'label.action.reboot.instance'; + }, + complete: function(args) { + if (args.password != null && args.password.length > 0) + return 'Password has been reset to ' + args.password; + else + return null; } }, notification: {