You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/14 18:15:18 UTC
[12/16] stratos git commit: fix tenant listing hbs issues after data
return changes
fix tenant listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bcd112c3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bcd112c3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bcd112c3
Branch: refs/heads/4.1.0-test
Commit: bcd112c3747225e982a2aab79c0fadd998de49da
Parents: 36a2622
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:50:20 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:50:20 2014 +0530
----------------------------------------------------------------------
.../themes/theme0/partials/users_form.hbs | 20 +++++++++++---------
.../console/users_form.jag | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bcd112c3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 3d6dea9..9325ec1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -93,16 +93,18 @@
</div>
{{/each}}
{{/ifCond}}
- {{#each content_body.sections.tenantInfoBean}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-building"></i>
- </div>
- <h2>{{tenantDomain}} </h2>
+ {{#ifCond formtype "==" "tenants"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-building"></i>
+ </div>
+ <h2>{{tenantDomain}} </h2>
- <div class="toggle-menu-description">{{email}} - {{createdDate}} </div>
- </div>
- {{/each}}
+ <div class="toggle-menu-description">{{email}} - {{createdDate}} </div>
+ </div>
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bcd112c3/components/org.apache.stratos.manager.console/console/users_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/users_form.jag b/components/org.apache.stratos.manager.console/console/users_form.jag
index 9dc45c3..4c2460d 100644
--- a/components/org.apache.stratos.manager.console/console/users_form.jag
+++ b/components/org.apache.stratos.manager.console/console/users_form.jag
@@ -55,7 +55,7 @@ if (elements.formtype == 'users') {
} else if (elements.formtype == 'tenants') {
list_data = util.RESTCalls.getTenants();
- if (list_data.tenantInfoBean && list_data.tenantInfoBean.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}
}