You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/06/14 20:33:53 UTC
git commit: CS-14230
Updated Branches:
refs/heads/master c3713a586 -> 237fd426e
CS-14230
Add password confirm to add account/user forms
Original patch by: oyla.smola@gmail.com
Reviewed-by: brian
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/237fd426
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/237fd426
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/237fd426
Branch: refs/heads/master
Commit: 237fd426e102012d00e9f2a7ec9653bc4ea55bc3
Parents: c3713a5
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jun 14 11:32:05 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jun 14 11:33:28 2012 -0700
----------------------------------------------------------------------
ui/scripts/accounts.js | 33 ++++++++++++++++++++++++++++++---
ui/scripts/ui/dialog.js | 3 +++
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/237fd426/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 16a058a..3682778 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -86,6 +86,15 @@
password: {
label: 'label.password',
validation: { required: true },
+ isPassword: true,
+ id: 'password'
+ },
+ 'password-confirm': {
+ label: 'label.confirm.password',
+ validation: {
+ required: true,
+ equalTo: '#password'
+ },
isPassword: true
},
email: {
@@ -683,7 +692,16 @@
password: {
label: 'label.password',
isPassword: true,
- validation: { required: true }
+ validation: { required: true },
+ id: 'password'
+ },
+ 'password-confirm': {
+ label: 'label.confirm.password',
+ validation: {
+ required: true,
+ equalTo: '#password'
+ },
+ isPassword: true
},
email: {
label: 'label.email',
@@ -793,8 +811,17 @@
newPassword: {
label: 'label.new.password',
isPassword: true,
- validation: { required: true }
- }
+ validation: { required: true },
+ id: 'newPassword'
+ },
+ 'password-confirm': {
+ label: 'label.confirm.password',
+ validation: {
+ required: true,
+ equalTo: '#newPassword'
+ },
+ isPassword: true
+ }
}
},
action: function(args) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/237fd426/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index b560f16..50c4ed7 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -322,6 +322,9 @@
if (field.defaultValue) {
$input.val(field.defaultValue);
}
+ if (field.id) {
+ $input.attr('id', field.id);
+ }
}
$input.addClass("disallowSpecialCharacters");
}