You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/02/14 08:57:19 UTC
git commit: making LB cartirdge as not dependent on tenant mode
Updated Branches:
refs/heads/master a037318a6 -> 8fef6c851
making LB cartirdge as not dependent on tenant mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8fef6c85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8fef6c85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8fef6c85
Branch: refs/heads/master
Commit: 8fef6c851891b7dcdcba06e59b93e7d08724917d
Parents: a037318
Author: rekathiru <rt...@gmail.com>
Authored: Fri Feb 14 13:26:57 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Feb 14 13:26:57 2014 +0530
----------------------------------------------------------------------
.../console/cartridges.jag | 26 +++++---------------
.../themes/theme1/partials/cartridges.hbs | 10 +++++++-
.../themes/theme1/renderers/cartridges.js | 3 +--
3 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8fef6c85/components/org.apache.stratos.manager.console/console/cartridges.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/cartridges.jag b/components/org.apache.stratos.manager.console/console/cartridges.jag
index 82f8e2f..ecb3795 100644
--- a/components/org.apache.stratos.manager.console/console/cartridges.jag
+++ b/components/org.apache.stratos.manager.console/console/cartridges.jag
@@ -1,22 +1,8 @@
<%
- var caramel = require('caramel')
- var utils = require('/util/utility.jag');
- var availableSingleTenantCartridges = utils.consoleAppUtil.getCartridges();
- availableSingleTenantCartridges = availableSingleTenantCartridges.cartridge;
-
-
- var log = new Log("config.stratos");
- for(var i=0;i<availableSingleTenantCartridges.length;i++) {
- if(availableSingleTenantCartridges[i].loadBalancer == true ) {
- availableSingleTenantCartridges.splice(i,1);
- i = i - 1;
- }
- }
- log.info("~~~~~~~~~~~~~: " + stringify(availableSingleTenantCartridges));
-
- var availableLbCartridges = utils.consoleAppUtil.getLbCartridges();
- caramel.render({
- cartridges:availableSingleTenantCartridges,
- lbcartridges:availableLbCartridges
- });
+var caramel = require('caramel')
+var utils = require('/util/utility.jag');
+var availableSingleTenantCartridges = utils.consoleAppUtil.getAvailableSingleTenantCartridges();
+caramel.render({
+ cartridges:availableSingleTenantCartridges
+});
%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8fef6c85/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
index bda72a5..50c6166 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
@@ -23,7 +23,15 @@
<div class="col-lg-9">
<a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a>
<div class="cartridge-description">{{description}}</div>
- <div class="cartridge-description">{{#if multiTenant}}<i class="fa fa-users"></i> Multi Tenant Enabled{{else}}<i class="fa fa-user"></i> Single Tenant{{/if}}</div>
+ <div class="cartridge-description">
+ {{#unless loadBalancer}}
+ {{#if multiTenant}}
+ <i class="fa fa-users"></i> Multi Tenant Enabled
+ {{else}}
+ <i class="fa fa-user"></i> Single Tenant
+ {{/if}}
+ {{/unless}}
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8fef6c85/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
index c68995c..4e8e156 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
@@ -1,8 +1,7 @@
var render = function (theme, data, meta, require) {
// Re-create the data structure of the cartridges.
var log = new Log();
- var cartridges_old = data.cartridges;
- var lb_cartridges_old = data.availableLbCartridges;
+ var cartridges_old = data.cartridges.cartridge;
var cartridges_new = [
{
kind: "Framework",