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 A897310807 for ; Thu, 24 Oct 2013 21:59:34 +0000 (UTC) Received: (qmail 40047 invoked by uid 500); 24 Oct 2013 21:59:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 39858 invoked by uid 500); 24 Oct 2013 21:59:27 -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 39766 invoked by uid 99); 24 Oct 2013 21:59:25 -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, 24 Oct 2013 21:59:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 15FC181C784; Thu, 24 Oct 2013 21:59:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <782c2952464041a6a3fcc64b9b4a09a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6df1998 Date: Thu, 24 Oct 2013 21:59:25 +0000 (UTC) Updated Branches: refs/heads/master 259245200 -> 6df199864 UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df19986 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df19986 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df19986 Branch: refs/heads/master Commit: 6df19986455f7fd7982e8396d2eef121b32cd307 Parents: 2592452 Author: Jessica Wang Authored: Thu Oct 24 14:58:23 2013 -0700 Committer: Jessica Wang Committed: Thu Oct 24 14:58:23 2013 -0700 ---------------------------------------------------------------------- ui/scripts/templates.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df19986/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index d4655e7..f45c2d2 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -600,7 +600,7 @@ //***** updateTemplate ***** var data = { id: args.context.templates[0].id, - zoneid: args.context.templates[0].zoneid, + //zoneid: args.context.templates[0].zoneid, //can't update template/ISO in only one zone. It always get updated in all zones. name: args.data.name, displaytext: args.data.displaytext, ostypeid: args.data.ostypeid, @@ -620,7 +620,7 @@ //***** updateTemplatePermissions ***** var data = { id: args.context.templates[0].id, - zoneid: args.context.templates[0].zoneid + //zoneid: args.context.templates[0].zoneid //can't update template/ISO in only one zone. It always get updated in all zones. }; //if args.data.ispublic is undefined, do not pass ispublic to API call. @@ -1419,7 +1419,7 @@ //***** updateIso ***** var data = { id: args.context.isos[0].id, - zoneid: args.context.isos[0].zoneid, + //zoneid: args.context.isos[0].zoneid, //can't update template/ISO in only one zone. It always get updated in all zones. name: args.data.name, displaytext: args.data.displaytext, ostypeid: args.data.ostypeid @@ -1437,7 +1437,7 @@ //***** updateIsoPermissions ***** var data = { id: args.context.isos[0].id, - zoneid: args.context.isos[0].zoneid + //zoneid: args.context.isos[0].zoneid //can't update template/ISO in only one zone. It always get updated in all zones. }; //if args.data.ispublic is undefined, do not pass ispublic to API call. if (args.data.ispublic == "on") {