You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/29 15:43:50 UTC

[1/2] git commit: updated refs/heads/master to 73c6c6c

Repository: cloudstack
Updated Branches:
  refs/heads/master eabf11c99 -> 73c6c6c96


CLOUDSTACK-8984: VPC Network offerings tab missing from UI

This is a regression from commit af2f21894ce061faadc8cec29b901719303a29dc

added vpcofferings to the select list


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9f614ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9f614ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9f614ce

Branch: refs/heads/master
Commit: d9f614cea22efb454b34572576ff59c01e694dce
Parents: 535ab51
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Wed Oct 28 12:35:52 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Thu Oct 29 09:21:16 2015 +0530

----------------------------------------------------------------------
 ui/scripts/configuration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9f614ce/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index fa2276d..14b0e15 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -28,7 +28,7 @@
         sectionSelect: {
             preFilter: function(args) {
                if(isAdmin())
-                   return ["serviceOfferings", "systemServiceOfferings", "diskOfferings", "networkOfferings"];
+                   return ["serviceOfferings", "systemServiceOfferings", "diskOfferings", "networkOfferings", "vpcOfferings"];
                else if(isDomainAdmin())
                    return ["serviceOfferings", "diskOfferings"];
                else

[2/2] git commit: updated refs/heads/master to 73c6c6c

Posted by re...@apache.org.
Merge pull request #996 from karuturi/CLOUDSTACK-8984

[4.6] CLOUDSTACK-8984: VPC Network offerings tab missing from UIThis is a regression from commit af2f21894ce061faadc8cec29b901719303a29dc

added vpcofferings to the select list

Before the change (from the bug):
![offerings_46](https://cloud.githubusercontent.com/assets/186833/10781847/34ae9bc4-7d71-11e5-8159-b90422ef34f6.png)

After the change:
![screen shot 2015-10-28 at 12 32 59 pm](https://cloud.githubusercontent.com/assets/186833/10781850/3ef96500-7d71-11e5-84c5-34589ec10bf9.png)

* pr/996:
  CLOUDSTACK-8984: VPC Network offerings tab missing from UI

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73c6c6c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73c6c6c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73c6c6c9

Branch: refs/heads/master
Commit: 73c6c6c96b227ec2843c0c6bc5ce7f6d7205ee4f
Parents: eabf11c d9f614c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Oct 29 15:43:14 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Oct 29 15:43:14 2015 +0100

----------------------------------------------------------------------
 ui/scripts/configuration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------