You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Pranav Saxena <pr...@citrix.com> on 2013/03/26 11:46:38 UTC
[ACS41] [PATCH REQUEST] - CLOUDSTACK 1008
Hi Chip,
Could you please apply the patch attached to this JIRA ticket - https://issues.apache.org/jira/browse/CLOUDSTACK-1008 ? It seems it's specific to 4.1 and hence I haven't committed it to master.
Thanks,
Pranav
RE: [ACS41] [PATCH REQUEST] - CLOUDSTACK 1008
Posted by Pranav Saxena <pr...@citrix.com>.
Thanks Chip!
Regards,
Pranav
-----Original Message-----
From: Chip Childers [mailto:chip.childers@sungard.com]
Sent: Tuesday, March 26, 2013 7:56 PM
To: Pranav Saxena
Cc: cloudstack-dev@incubator.apache.org
Subject: Re: [ACS41] [PATCH REQUEST] - CLOUDSTACK 1008
On Tue, Mar 26, 2013 at 10:46:38AM +0000, Pranav Saxena wrote:
>
> Hi Chip,
>
> Could you please apply the patch attached to this JIRA ticket - https://issues.apache.org/jira/browse/CLOUDSTACK-1008 ? It seems it's specific to 4.1 and hence I haven't committed it to master.
>
> Thanks,
> Pranav
Done! Thanks Pranav.
> From e1a9062e1c5d27e5b7a63d4f00c783112a1d3558 Mon Sep 17 00:00:00 2001
> From: Pranav Saxena <pr...@citrix.com>
> Date: Tue, 26 Mar 2013 16:02:19 +0530
> Subject: [PATCH] CLOUDSTACK-1008:Egress tab should not be presented in
> the UI for Shared Networks
>
>
> Signed-off-by: Pranav Saxena <pr...@citrix.com>
> ---
> ui/scripts/network.js | 15 ++++++++++++++-
> 1 files changed, 14 insertions(+), 1 deletions(-)
>
> diff --git a/ui/scripts/network.js b/ui/scripts/network.js index
> 84cc067..9bd0857 100755
> --- a/ui/scripts/network.js
> +++ b/ui/scripts/network.js
> @@ -807,6 +807,7 @@
> var hasSRXFirewall = false;
> var isVPC = false;
> var isAdvancedSGZone = false;
> + var type;
> var hiddenTabs = [];
>
> // Get network offering data @@ -862,12 +863,24 @@
> isAdvancedSGZone = zone.securitygroupsenabled;
> }
> });
> +
> + $.ajax({
> + url:createURL('listNetworks'),
> + data:{ id:args.context.networks[0].id },
> + async:false,
> + success:function(json){
> + type = json.listnetworksresponse.network[0].type;
> +
> + }
> +
> + });
> +
>
> if (!networkOfferingHavingELB) {
> hiddenTabs.push("addloadBalancer");
> }
>
> - if (isVPC || isAdvancedSGZone || hasSRXFirewall) {
> + if (isVPC || isAdvancedSGZone || hasSRXFirewall ||
> + type="Shared") {
> hiddenTabs.push('egressRules');
> }
>
> --
> 1.7.5.4
>
Re: [ACS41] [PATCH REQUEST] - CLOUDSTACK 1008
Posted by Chip Childers <ch...@sungard.com>.
On Tue, Mar 26, 2013 at 10:46:38AM +0000, Pranav Saxena wrote:
>
> Hi Chip,
>
> Could you please apply the patch attached to this JIRA ticket - https://issues.apache.org/jira/browse/CLOUDSTACK-1008 ? It seems it's specific to 4.1 and hence I haven't committed it to master.
>
> Thanks,
> Pranav
Done! Thanks Pranav.
> From e1a9062e1c5d27e5b7a63d4f00c783112a1d3558 Mon Sep 17 00:00:00 2001
> From: Pranav Saxena <pr...@citrix.com>
> Date: Tue, 26 Mar 2013 16:02:19 +0530
> Subject: [PATCH] CLOUDSTACK-1008:Egress tab should not be presented in the UI
> for Shared Networks
>
>
> Signed-off-by: Pranav Saxena <pr...@citrix.com>
> ---
> ui/scripts/network.js | 15 ++++++++++++++-
> 1 files changed, 14 insertions(+), 1 deletions(-)
>
> diff --git a/ui/scripts/network.js b/ui/scripts/network.js
> index 84cc067..9bd0857 100755
> --- a/ui/scripts/network.js
> +++ b/ui/scripts/network.js
> @@ -807,6 +807,7 @@
> var hasSRXFirewall = false;
> var isVPC = false;
> var isAdvancedSGZone = false;
> + var type;
> var hiddenTabs = [];
>
> // Get network offering data
> @@ -862,12 +863,24 @@
> isAdvancedSGZone = zone.securitygroupsenabled;
> }
> });
> +
> + $.ajax({
> + url:createURL('listNetworks'),
> + data:{ id:args.context.networks[0].id },
> + async:false,
> + success:function(json){
> + type = json.listnetworksresponse.network[0].type;
> +
> + }
> +
> + });
> +
>
> if (!networkOfferingHavingELB) {
> hiddenTabs.push("addloadBalancer");
> }
>
> - if (isVPC || isAdvancedSGZone || hasSRXFirewall) {
> + if (isVPC || isAdvancedSGZone || hasSRXFirewall || type="Shared") {
> hiddenTabs.push('egressRules');
> }
>
> --
> 1.7.5.4
>