You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/07/22 22:44:40 UTC
git commit: updated refs/heads/4.2 to f39de1d
Updated Branches:
refs/heads/4.2 4e59c4daf -> f39de1d79
CLOUDSTACK-3427: UI > UCS manager > implement listUcsManager API since it has been fixed at server-side.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f39de1d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f39de1d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f39de1d7
Branch: refs/heads/4.2
Commit: f39de1d79195649866b1dd1d7f4baadad3f84e7f
Parents: 4e59c4d
Author: Jessica Wang <je...@apache.org>
Authored: Mon Jul 22 11:54:10 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Jul 22 13:44:29 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 63 ++++++++++++++++++++++++++++-------------------
1 file changed, 38 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f39de1d7/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4da3511..75ab2a6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -14127,30 +14127,33 @@
label: 'label.url'
}
},
- dataProvider: function(args) {
- /*
- $.ajax({
- url: createURL('listUcsManager'),
- data: {
- zoneid: args.context.physicalResources[0].id
- },
- success: function(json) {
-
- }
- });
- */
-
- args.response.success({
- data: [{
- id: '11',
- name: 'UCS Manager 1',
- url: '10.196.72.1'
- }, {
- id: '11',
- name: 'UCS Manager 2',
- url: '10.196.72.2'
- }]
- });
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL('listUcsManager'),
+ data: {
+ zoneid: args.context.physicalResources[0].id
+ },
+ success: function(json) {
+ /*
+ json = //override json (for testing only)
+ {
+ "listucsmanagerreponse": {
+ "count": 1,
+ "ucsmanager": [
+ {
+ "id": "07b5b813-83ed-4859-952c-c95cafb63ac4",
+ "name": "ucsmanager",
+ "url": "10.223.184.2",
+ "zoneid": "54c9a65c-ba89-4380-96e9-1d429c5372e3"
+ }
+ ]
+ }
+ };
+ */
+ var items = json.listucsmanagerreponse.ucsmanager;
+ args.response.success({ data: items });
+ }
+ });
},
actions: {
add: {
@@ -14361,7 +14364,17 @@
bladeid: args.context.blades[0].id
},
success: function(json) {
- //json.associateucsprofiletobladeresponse.ucsblade
+ /*
+ {
+ "associateucsprofiletobladeresponse": {
+ "ucsblade": {
+ "id": "8f63030a-033c-458e-890f-b2c8863d9542",
+ "ucsmanagerid": "9d8566c0-f870-4e89-9864-7a3e0b332558",
+ "bladedn": "sys/chassis-1/blade-2"
+ }
+ }
+ }
+ */
args.response.success({
data: {
associatedProfileDn: args.data.profiledn