Updated Branches: refs/heads/master c1b2921bf -> 9960fae5e
subscribe cartridge functionality Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/24e0d052 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/24e0d052 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/24e0d052 Branch: refs/heads/master Commit: 24e0d05276368b6905b13a4819be45b6d5cd4f6a Parents: 543153c Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 17 20:13:37 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 17 20:13:37 2014 +0530 ---------------------------------------------------------------------- .../console/subscribe_cartridge.jag | 12 ++++++++++-- .../themes/theme1/partials/subscribe_cartridge.hbs | 10 ++++++---- .../themes/theme1/renderers/subscribe_cartridge.js | 2 ++ .../console/util/utility.jag | 8 +++++++- 4 files changed, 25 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24e0d052/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag index 6714559..c333a38 100644 --- a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag +++ b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag @@ -1,6 +1,14 @@ <% -var caramel = require('caramel') +var log = new Log("subscribe_cartridge"); +var caramel = require('caramel'); +var utils = require('/util/utility.jag'); +var autoScalePolicies = utils.consoleAppUtil.getAutoScalePolicies(); +log.info(autoScalePolicies); +var deploymentPolicies = utils.consoleAppUtil.getDeploymentPolicies(); +log.info(deploymentPolicies); caramel.render({ - name:"PHP 5.4 Cartridge" + name:"PHP 5.4 Cartridge", + autoScalePolicies:autoScalePolicies, + deploymentPolicies:deploymentPolicies }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24e0d052/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs index a783e63..607f824 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs @@ -71,8 +71,9 @@ Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." data-help-x-offset="50" data-help-y-offset="-10" > - <option>policyx</option> - <option>policyy</option> + {{#each autoScalePolicies}} + <option>{{foo}}</option> + {{/each}} </select> </div> </div> @@ -87,8 +88,9 @@ Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." data-help-x-offset="50" data-help-y-offset="-10" > - <option>policyx</option> - <option>policyy</option> + {{#each deploymentPolicies}} + <option>{{foo}}</option> + {{/each}} </select> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24e0d052/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js index 56210cd..79000a2 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js @@ -5,6 +5,8 @@ var render = function (theme, data, meta, require) { partial: 'subscribe_cartridge', context: { title:data.name, + autoScalePolicies:data.autoScalePolicies, + deploymentPolicies:data.deploymentPolicies, cartridgeType:meta.request.getParameter('cartridgeType') } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/24e0d052/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index 49479b7..aaf66cf 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -106,10 +106,16 @@ consoleAppUtil = new function(){ }; this.subscribeToCartridge = function(cartridgeBeanInfo){ - log.info(cartridgeBeanInfo); return this.sendReceive("POST","/cartridge/subscribe", cartridgeBeanInfo).data; } + this.getAutoScalePolicies = function(){ + return this.sendReceive("GET","/policy/autoscale",{}).data; + } + + this.getDeploymentPolicies = function(){ + return this.sendReceive("GET","/policy/deployment",{}).data; + } // refactor sendRecive and send method. duplicate code... this.sendReceive = function(httpMethod,urlPostFix,data){
