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 2013/12/06 21:34:34 UTC
[1/2] git commit: updated refs/heads/master to d09d218
Updated Branches:
refs/heads/master eb7cd06e1 -> d09d21847
Detail view: Allow passing error with custom action's complete fn
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d09d2184
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d09d2184
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d09d2184
Branch: refs/heads/master
Commit: d09d21847c3f0006dbefd9829afc1bef2789924f
Parents: 9dabad0
Author: Brian Federle <br...@citrix.com>
Authored: Fri Dec 6 12:33:03 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Dec 6 12:34:31 2013 -0800
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d09d2184/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 38e66ee..d991f2d 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -147,12 +147,21 @@
var $item = args.$item;
var $row = $detailView.data('list-view-row');
+ var error = args.error;
notification.desc = messages.notification(args.messageArgs);
notification._custom = $.extend(args._custom ? args._custom : {}, {
$detailView: $detailView
});
+ if (error) {
+ notification.interval = 1;
+ notification.poll = function(args) {
+ cloudStack.dialog.notice({ message: error });
+ args.error(error);
+ }
+ }
+
cloudStack.ui.notifications.add(
notification,
[2/2] git commit: updated refs/heads/master to d09d218
Posted by bf...@apache.org.
Fix broken change password UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9dabad02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9dabad02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9dabad02
Branch: refs/heads/master
Commit: 9dabad02533833dd48389bf233c6236b5eda64de
Parents: eb7cd06
Author: Brian Federle <br...@citrix.com>
Authored: Fri Dec 6 12:33:20 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Dec 6 12:34:31 2013 -0800
----------------------------------------------------------------------
ui/scripts/accounts.js | 109 +++++++++++++++++++++++---------------------
1 file changed, 56 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dabad02/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 72bc00f..8780206 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1135,59 +1135,62 @@
}
},
- action: function(args) {
- if (isLdapEnabled()) {
- alert(dictionary["error.could.not.change.your.password.because.ldap.is.enabled"]);
- args.response.error({});
- } else {
- cloudStack.dialog.createForm({
- noDialog: false,
- form: {
- title: 'label.action.change.password',
- fields: {
- newPassword: {
- label: 'label.new.password',
- isPassword: true,
- validation: {
- required: true
- },
- id: 'newPassword'
- },
- 'password-confirm': {
- label: 'label.confirm.password',
- validation: {
- required: true,
- equalTo: '#newPassword'
- },
- isPassword: true
- }
- }
- }
- })
- var password = args.data.newPassword;
- if (md5Hashed)
- password = $.md5(password);
-
- var data = {
- id: args.context.users[0].id,
- password: password
- };
- $.ajax({
- url: createURL('updateUser'),
- data: data,
- type: "POST",
- success: function(json) {
- args.response.success({
- data: json.updateuserresponse.user
- });
- }
- });
-
- }
- },
- notification: {
- poll: function(args) {
- args.complete();
+ action: {
+ custom: function(args) {
+ var start = args.start;
+ var complete = args.complete;
+ var context = args.context;
+
+ if (isLdapEnabled()) {
+ cloudStack.dialog.notice({ message: _l('error.could.not.change.your.password.because.ldap.is.enabled') });
+ } else {
+ cloudStack.dialog.createForm({
+ form: {
+ title: 'label.action.change.password',
+ fields: {
+ newPassword: {
+ label: 'label.new.password',
+ isPassword: true,
+ validation: {
+ required: true
+ },
+ id: 'newPassword'
+ },
+ 'password-confirm': {
+ label: 'label.confirm.password',
+ validation: {
+ required: true,
+ equalTo: '#newPassword'
+ },
+ isPassword: true
+ }
+ }
+ },
+ after: function(args) {
+ start();
+
+ var password = args.data.newPassword;
+
+ if (md5Hashed)
+ password = $.md5(password);
+
+ $.ajax({
+ url: createURL('updateUser'),
+ data: {
+ id: context.users[0].id,
+ password: password
+ },
+ type: "POST",
+ success: function(json) {
+ complete();
+ },
+ error: function(json) {
+ complete({ error: parseXMLHttpResponse(json) });
+ }
+ });
+ }
+ });
+ }
}
}
},