cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/ui-cisco-asa1000v-support to 1177589
Date Fri, 10 May 2013 18:56:47 GMT
Updated Branches:
  refs/heads/ui-cisco-asa1000v-support b1f6d8914 -> 1177589a6


CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - physical network - network
service providers - Cisco VNMC - fix a bug that detailView loads forever.


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

Branch: refs/heads/ui-cisco-asa1000v-support
Commit: 1177589a6bb433577c557771ea905aab236bb21b
Parents: b1f6d89
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri May 10 11:54:17 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri May 10 11:54:17 2013 -0700

----------------------------------------------------------------------
 ui/modules/infrastructure/infrastructure.js        |    4 ++--
 .../vnmcNetworkProvider/vnmcNetworkProvider.js     |   15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1177589a/ui/modules/infrastructure/infrastructure.js
----------------------------------------------------------------------
diff --git a/ui/modules/infrastructure/infrastructure.js b/ui/modules/infrastructure/infrastructure.js
index 4111aa5..55767d3 100644
--- a/ui/modules/infrastructure/infrastructure.js
+++ b/ui/modules/infrastructure/infrastructure.js
@@ -36,7 +36,7 @@
           var selectedZoneObj = data.selectedZoneObj;   
           var selectedPhysicalNetworkObj = data.selectedPhysicalNetworkObj;
           if(selectedZoneObj.networktype == "Advanced"){      
-            var selectedProviderObj = {};
+            var selectedProviderObj = null;
             $.ajax({
               url: createURL('listNetworkServiceProviders'),
               data: {
@@ -55,7 +55,7 @@
             nspHardcodingArray.push({
               id: id,
               name: name,
-              state: selectedProviderObj.state
+              state: selectedProviderObj? selectedProviderObj.state : 'Disabled'
             });
           } 
         });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1177589a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
----------------------------------------------------------------------
diff --git a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
index cecf56c..cad4a49 100644
--- a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
+++ b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
@@ -278,8 +278,11 @@
               id: { label: 'label.id' },
               servicelist: {
                 label: 'Services',
-                converter: function(args){                  
-                  return args.join(', ');
+                converter: function(args){  
+                  if(args)                  
+                    return args.join(', ');
+                  else
+                    return '';
                 }
               }
             }
@@ -296,6 +299,14 @@
                 if(items != null && items.length > 0) {   
                   args.response.success({ data: items[0] });                  
                 }
+                else {
+                  args.response.success({ 
+                    data: {
+                      name: 'CiscoVnmc',
+                      state: 'Disabled'
+                    }
+                  })
+                }
               }
             });                 
           }


Mime
View raw message