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 596851088F for ; Sat, 10 Aug 2013 00:27:02 +0000 (UTC) Received: (qmail 70295 invoked by uid 500); 10 Aug 2013 00:27:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70251 invoked by uid 500); 10 Aug 2013 00:27: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 70244 invoked by uid 99); 10 Aug 2013 00:27: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; Sat, 10 Aug 2013 00:27:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 031A58BB5C0; Sat, 10 Aug 2013 00:27:01 +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: <4ec10fb4e0044c899839ba3d0343d8bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 24ef5ba Date: Sat, 10 Aug 2013 00:27:01 +0000 (UTC) Updated Branches: refs/heads/master 4333209af -> 24ef5ba9f CLOUDSTACK-4134: UI > Infrastructure > zone > physical network > guest > edit action - pass vlan parameter to updatePhysicalNetwork API no matter vlan field is blank or not. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24ef5ba9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24ef5ba9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24ef5ba9 Branch: refs/heads/master Commit: 24ef5ba9f7a9634ac11192aa02dba578a6757d3c Parents: 4333209 Author: Jessica Wang Authored: Fri Aug 9 17:24:51 2013 -0700 Committer: Jessica Wang Committed: Fri Aug 9 17:26:53 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24ef5ba9/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 531c992..f4bee5a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1086,16 +1086,15 @@ var data = { id: selectedPhysicalNetworkObj.id, }; - if (args.data.vlan != null && args.data.vlan.length > 0) { - $.extend(data, { - vlan: args.data.vlan - }); - } - if (args.data.tags != null && args.data.tags.length > 0) { - $.extend(data, { - tags: args.data.tags - }); - } + + $.extend(data, { + vlan: args.data.vlan + }); + + $.extend(data, { + tags: args.data.tags + }); + $.ajax({ url: createURL('updatePhysicalNetwork'), data: data,