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/06/06 20:41:06 UTC
git commit: updated refs/heads/master to 36ed93f
Updated Branches:
refs/heads/master 62025632f -> 36ed93f8a
CLOUDSTACK-2880: UI - zone detail - add VMware DC action - replace URL field with vcenter field and make vcenter required.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36ed93f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36ed93f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36ed93f8
Branch: refs/heads/master
Commit: 36ed93f8abd21e585e73d2070faca48b3cf52cfb
Parents: 6202563
Author: Jessica Wang <je...@apache.org>
Authored: Thu Jun 6 11:39:05 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Jun 6 11:39:05 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36ed93f8/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c1eef69..e3d7b41 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5388,9 +5388,9 @@
label: 'label.name',
validation: { required: true }
},
- url: {
- label: 'label.url',
- validation: { required: false }
+ vcenter: {
+ label: 'vcenter',
+ validation: { required: true }
},
username: {
label: 'label.username',
@@ -5406,14 +5406,10 @@
action: function(args) {
var data = {
zoneid: args.context.physicalResources[0].id,
- name: args.data.name
- };
+ name: args.data.name,
+ vcenter: args.data.vcenter
+ };
- if(args.data.url != null && args.data.url.length > 0) {
- $.extend(data, {
- url: args.data.url
- })
- }
if(args.data.username != null && args.data.username.length > 0) {
$.extend(data, {
username: args.data.username