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 15:26:39 UTC

[1/2] stratos git commit: fix no cartridge found issue on group editor

Repository: stratos
Updated Branches:
  refs/heads/master 9e5fbf99d -> b764cd2de


fix no cartridge found issue on group editor


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

Branch: refs/heads/master
Commit: ce74516b691d3a5ecbe4d4673784d8d227d17f1f
Parents: 8674cd6
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Apr 30 18:50:39 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Apr 30 18:50:39 2015 +0530

----------------------------------------------------------------------
 .../console/themes/theme0/js/custom/applications_group_editor.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/ce74516b/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 ea822f9..30bb282 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.length == 0){
+    if(data == null || data.length == 0){
         cartridgeListHtml = 'No Cartridges found..';
     }else{
         for(var cartridge in data){


[2/2] stratos git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos

Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos


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

Branch: refs/heads/master
Commit: b764cd2debc1eb96555eca7be7adf9c31a9589a3
Parents: ce74516 9e5fbf9
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Apr 30 18:51:23 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Thu Apr 30 18:51:23 2015 +0530

----------------------------------------------------------------------
 .../forms/default/configure/autoscalingpolicies.json        | 1 -
 .../controllers/forms/default/configure/cartridges.json     | 1 -
 .../forms/schema/configure/autoscalingpolicies.json         | 8 --------
 .../controllers/forms/schema/configure/cartridges.json      | 9 ---------
 4 files changed, 19 deletions(-)
----------------------------------------------------------------------