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/05/12 03:18:35 UTC
[1/2] stratos git commit: fix application listing empty handling
Repository: stratos
Updated Branches:
refs/heads/master 1b6626874 -> d33fa0734
fix application listing empty handling
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/da0cd8b6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/da0cd8b6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/da0cd8b6
Branch: refs/heads/master
Commit: da0cd8b6cbc65e38ef4399b3225020eca00698da
Parents: 1b66268
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue May 12 06:44:57 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Tue May 12 06:44:57 2015 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/da0cd8b6/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 40e35bf..3fe6019 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -98,9 +98,7 @@ switch (formtype) {
formTitle = "Application Definition",
buttonText = "Application Definition";
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
+ if (list_data.status == 'error') {
list_data = null;
}
break;
[2/2] stratos git commit: fix empty handler on group and application
editors
Posted by da...@apache.org.
fix empty handler on group and application editors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d33fa073
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d33fa073
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d33fa073
Branch: refs/heads/master
Commit: d33fa0734f3eb9b56ed364b5a07b5da35e0f9ca1
Parents: da0cd8b
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Tue May 12 06:47:46 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Tue May 12 06:47:46 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/applications-editor.js | 4 ++--
.../console/themes/theme0/js/custom/applications_group_editor.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d33fa073/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 0c5e8e1..dd262ca 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
@@ -728,7 +728,7 @@ var applicationBlockDefault = {
//create cartridge list
var cartridgeListHtml='';
function generateCartridges(data){
- if(data == null || data.length == 0){
+ if(data.status == 'error'){
cartridgeListHtml = 'No Cartridges found..';
}else{
for(var cartridge in data){
@@ -749,7 +749,7 @@ function generateCartridges(data){
//create group list
var groupListHtml='';
function generateGroups(data){
- if(data == null || data.length == 0){
+ if(data.status == 'error'){
groupListHtml = 'No Groups found..';
}else {
for (var group in data) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/d33fa073/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
index 8451a15..2206a28 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js
@@ -127,7 +127,7 @@ function addJsplumbGroup(cartridgeCounter) {
//create cartridge list
var cartridgeListHtml='';
function generateCartridges(data){
- if(data == null || data.length == 0){
+ if(data.status == 'error'){
cartridgeListHtml = 'No Cartridges found..';
}else{
for(var cartridge in data){