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:19 UTC
[13/16] stratos git commit: fix application listing hbs issues after
data return changes
fix application 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/ddda83a9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ddda83a9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ddda83a9
Branch: refs/heads/4.1.0-test
Commit: ddda83a9ca709a0a409a4c69a6064b2e1cfb7a80
Parents: bcd112c
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 18:02:28 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 18:02:28 2014 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 3 +-
.../theme0/partials/applications_form.hbs | 36 +++++++++++---------
.../theme0/renderers/applications_form.js | 1 +
3 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index 71efcfe..6c1326a 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -84,7 +84,7 @@ switch (formtype) {
break;
case "applications":
list_data = util.RESTCalls.getApplications();
- if (list_data.applications && list_data.applications.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}
break;
@@ -120,6 +120,7 @@ var caramelData = {
applicationEditor: applicationEditor,
formTitle: formTitle,
formDataRaw: JSON.stringify(formDataRaw),
+ formtype:elements.formtype,
//formDataRaw: JSON.stringify(partition_data.partition[0]),
formDataEdit: JSON.stringify(formDataEdit),
formData: JSON.stringify(formData),
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 415f9d2..2640ed2 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -85,28 +85,30 @@
{{/if}}
<div class="row general-table row-overide">
- {{#each content_body.sections.applications}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-th-large"></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
+ {{#ifCond formtype "==" "applications"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-th-large"></i>
+ </div>
+ <h2 class="truncate">{{id}} </h2>
- <div class="toggle-menu-description">{{description}} </div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/applications/applications/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}} </div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/applications/applications/{{id}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/applications/applications/{{id}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
{{#each content_body.sections}}
<div class="block col-md-4 grid-group-item border-right">
<div class="toggle-menu-icon">
http://git-wip-us.apache.org/repos/asf/stratos/blob/ddda83a9/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
index d5ec8be..d02a2e5 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
@@ -205,6 +205,7 @@ var render = function (theme, data, meta, require) {
formData: data.formData,
formDataRaw: data.formDataRaw,
formDataEdit: data.formDataEdit,
+ formtype:data.formtype,
isForm: data.isForm,
isEdit:data.isEdit,
formTitle: data.formTitle,