stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [3/8] stratos git commit: fix groups listing with new JSON return
Date Sat, 13 Dec 2014 04:19:30 GMT
fix groups listing with new JSON return


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5150a8be
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5150a8be
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5150a8be

Branch: refs/heads/4.1.0-test
Commit: 5150a8be8b92a0e9110dde791a03359a65f26a57
Parents: 3aab09e
Author: Dakshika Jayathilaka <sinhaladjs@gmail.com>
Authored: Thu Dec 11 23:06:26 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Sat Dec 13 09:45:24 2014 +0530

----------------------------------------------------------------------
 .../console/applications_form.jag                        | 11 ++++++-----
 .../console/themes/theme0/partials/applications_form.hbs |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5150a8be/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 66071da..91d01b3 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -69,13 +69,14 @@ var formtype = elements.formtype;
 switch (formtype) {
     case "groups":
         list_data = util.RESTCalls.getGroups();
-        if (list_data.serviceGroup && list_data.serviceGroup.length === 0) {
+            log.info(list_data)
+        if (list_data.groups && list_data.groups.length === 0) {
             list_data = null;
         }else{
-            formDataEdit = list_data.serviceGroup;
-            for (specNumber in list_data.serviceGroup) {
-                if (list_data.serviceGroup[specNumber].name == elements.action) {
-                    formDataEdit = list_data.serviceGroup[specNumber];
+            formDataEdit = list_data.groups;
+            for (specNumber in list_data.groups) {
+                if (list_data.groups[specNumber].name == elements.action) {
+                    formDataEdit = list_data.groups[specNumber];
                 }
 
             }

http://git-wip-us.apache.org/repos/asf/stratos/blob/5150a8be/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 83d660a..7354382 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
@@ -107,7 +107,7 @@
                         </div>
                     </div>
                 {{/each}}
-                {{#each content_body.sections.serviceGroup}}
+                {{#each content_body.sections.groups}}
                     <div class="block col-md-4 grid-group-item border-right">
                         <div class="toggle-menu-icon">
                             <i class="fa fa-th-large"></i>


Mime
View raw message