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 00A0310030 for ; Tue, 24 Sep 2013 18:19:14 +0000 (UTC) Received: (qmail 2365 invoked by uid 500); 24 Sep 2013 18:19:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2006 invoked by uid 500); 24 Sep 2013 18:19:02 -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 1977 invoked by uid 99); 24 Sep 2013 18:19:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Sep 2013 18:19:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 01D02908CFF; Tue, 24 Sep 2013 18:19:01 +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: Tue, 24 Sep 2013 18:19:01 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/19] git commit: updated refs/heads/ui-restyle to 4b63867 Updated Branches: refs/heads/ui-restyle 157836bfc -> 4b638672b 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/c1b5612c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1b5612c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1b5612c Branch: refs/heads/ui-restyle Commit: c1b5612c2d100b3e17ff3ef72e54546faf33b3e3 Parents: 62d49b3 Author: Jessica Wang Authored: Mon Sep 23 12:00:14 2013 -0700 Committer: Jessica Wang Committed: Mon Sep 23 12:00:14 2013 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1b5612c/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: {