Subscribed cartridge groups show all the subscribed cartridge informations instead of group's information
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1e606455 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1e606455 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1e606455 Branch: refs/heads/4.0.0-grouping Commit: 1e606455f6b11bf91f82c27b3d613dc590da32a0 Parents: b1a1181 Author: Udara Liyanage <[email protected]> Authored: Mon Aug 18 13:19:49 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Mon Aug 18 13:19:49 2014 +0530 ---------------------------------------------------------------------- .../console/themes/theme1/partials/cartridge_info_sg.hbs | 2 +- .../stratos/rest/endpoint/services/ServiceUtils.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1e606455/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info_sg.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info_sg.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info_sg.hbs index a72dfcd..871f12c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info_sg.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info_sg.hbs @@ -22,7 +22,7 @@ <div class="container content-starter"> <div class="row"> <div class="col-lg-12"> - <h1><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i> {{serviceGroup}})</h1> + <h1><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i> {{serviceGroup}}</h1> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/1e606455/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 9eff4d1..5b1a01e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -750,11 +750,13 @@ public class ServiceUtils { // Ignoring the LB cartridges since they are not shown to the user. if (cartridge.isLoadBalancer()) continue; - if(StringUtils.isNotEmpty(serviceGroup) && cartridge.getServiceGroup() != null && - !cartridge.getServiceGroup().equals(serviceGroup)){ - continue; + if (StringUtils.isNotEmpty(serviceGroup)) { + if (cartridge.getServiceGroup() != null && serviceGroup.equals(cartridge.getServiceGroup())) { + cartridges.add(cartridge); + } + } else { + cartridges.add(cartridge); } - cartridges.add(cartridge); } } else { if (log.isDebugEnabled()) {
