You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by da...@apache.org on 2015/04/30 17:18:51 UTC
[1/2] stratos git commit: fix no appliction definition handler to map
with REST API change
Repository: stratos
Updated Branches:
refs/heads/master ae511af99 -> 385eadba2
fix no appliction definition handler to map with REST API change
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8dea27c3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8dea27c3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8dea27c3
Branch: refs/heads/master
Commit: 8dea27c351719213a533ee378612f6646cfd7961
Parents: ae511af
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Apr 30 20:45:11 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Apr 30 20:45:11 2015 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8dea27c3/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 8d828bc..40e35bf 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -100,6 +100,8 @@ switch (formtype) {
list_data = util.RESTCalls.getApplications();
if (list_data && list_data.length === 0) {
list_data = null;
+ }else if(list_data.errorCode == '404'){ //TODO : need to fix this with REST API class
+ list_data = null;
}
break;
[2/2] stratos git commit: add null handler to application editor UI
Posted by da...@apache.org.
add null handler to application editor UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/385eadba
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/385eadba
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/385eadba
Branch: refs/heads/master
Commit: 385eadba27ebaa31d89ce3e3bcc1182bdc0a17e6
Parents: 8dea27c
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Apr 30 20:47:31 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Apr 30 20:47:31 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications-editor.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/385eadba/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
index db44d9e..57d202c 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
@@ -694,7 +694,7 @@ var applicationBlockDefault = {
//create cartridge list
var cartridgeListHtml='';
function generateCartridges(data){
- if(data.length == 0){
+ if(data == null || data.length == 0){
cartridgeListHtml = 'No Cartridges found..';
}else{
for(var cartridge in data){
@@ -715,7 +715,7 @@ function generateCartridges(data){
//create group list
var groupListHtml='';
function generateGroups(data){
- if(data.length == 0){
+ if(data == null || data.length == 0){
groupListHtml = 'No Groups found..';
}else {
for (var group in data) {