You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/05/24 22:46:41 UTC

git commit: updated refs/heads/UI-explicitDedication to 7f0e656

Updated Branches:
  refs/heads/UI-explicitDedication a1cd244a1 -> 7f0e6561a


Pod explicit dedication Detail View


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

Branch: refs/heads/UI-explicitDedication
Commit: 7f0e6561a535f409c78a3325c8ad03365b8b0395
Parents: a1cd244
Author: Pranav Saxena <pr...@citrix.com>
Authored: Sat May 25 02:15:44 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Sat May 25 02:15:44 2013 +0530

----------------------------------------------------------------------
 ui/scripts/system.js |   58 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f0e6561/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 2f667a2..f7ef048 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8331,23 +8331,53 @@
                       },
                       label: 'label.allocation.state'
                     }
-                  }
+                  },
+
+                   {
+
+                   isdedicated:{label:'Dedicated'},
+                   domainid:{label:'Domain ID'}
+
+                   }
+
                 ],
 
                 dataProvider: function(args) {								  
-									$.ajax({
-										url: createURL("listPods&id=" + args.context.pods[0].id),
-										dataType: "json",
-										async: true,
-										success: function(json) {										  
-											var item = json.listpodsresponse.pod[0];
-											args.response.success({
-												actionFilter: podActionfilter,
-												data:item
-											});
-										}
-									});									              
-                }
+                
+                                                                        $.ajax({
+                                                                                url: createURL("listPods&id=" + args.context.pods[0].id),
+                                                                                dataType: "json",
+                                                                                async: false,
+                                                                                success: function(json) {
+                                                                                     var  item = json.listpodsresponse.pod[0];
+
+
+                                                                                       $.ajax({
+                                                    url:createURL("listDedicatedPods&podid=" +args.context.pods[0].id),
+                                                    dataType:"json",
+                                                    async:false,
+                                                    success:function(json){
+                                                        var podItem = json.listdedicatedpodsresponse ? json.listdedicatedpodsresponse.dedicatedpod[0]:[];
+                                                        if (podItem.domainid != null) {
+                                                            $.extend(item, podItem , { isdedicated: 'Yes' });
+                                                   }
+                                                 },
+                                                 error:function(json){
+                                                        $.extend(item ,{ isdedicated: 'No' })
+
+
+                                                 }
+                                           });
+                                             args.response.success({
+                                                actionFilter: podActionfilter,
+                                                data: item
+                                            });
+
+                                         }
+                                                                        });
+
+
+                 }
               },
 
               ipAllocations: {