You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by is...@apache.org on 2013/07/22 09:34:57 UTC
[1/2] git commit: updated
refs/heads/ui-dedicatedresources-refactoring to dabd167
Updated Branches:
refs/heads/master a75a62a31 -> 39a730ccd
refs/heads/ui-dedicatedresources-refactoring 63b398e93 -> dabd16713
Add proper time interval for dedicate operation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dabd1671
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dabd1671
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dabd1671
Branch: refs/heads/ui-dedicatedresources-refactoring
Commit: dabd167132f96370617f2f3075c66b2f320c62fe
Parents: 63b398e
Author: Isaac Chiang <is...@gmail.com>
Authored: Thu Jul 18 22:42:18 2013 +0800
Committer: Isaac Chiang <is...@gmail.com>
Committed: Thu Jul 18 22:42:18 2013 +0800
----------------------------------------------------------------------
ui/scripts/system.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dabd1671/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a677d91..92f152a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9478,6 +9478,7 @@
},
notification: {
poll: pollAsyncJobResult,
+ interval: 5000,
// FIXME: should use label tag
desc: "Dedicate Pod"
},
@@ -10432,6 +10433,7 @@
},
notification: {
poll: pollAsyncJobResult,
+ interval: 5000,
// FIXME: should use label tag
desc: 'Dedicate Cluster'
},
@@ -11534,6 +11536,7 @@
},
notification: {
poll: pollAsyncJobResult,
+ interval: 7000,
// FIXME: should use label tag
desc: "Dedicate Host"
},
[2/2] git commit: updated refs/heads/master to 39a730c
Posted by is...@apache.org.
CLOUDSTACK-3388:No error message shows when a dedicate operation failed during the creation of a pod/cluster
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39a730cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39a730cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39a730cc
Branch: refs/heads/master
Commit: 39a730ccd1977d13221a0897beb5047828aa24ae
Parents: a75a62a
Author: Isaac Chiang <is...@gmail.com>
Authored: Mon Jul 22 15:33:48 2013 +0800
Committer: Isaac Chiang <is...@gmail.com>
Committed: Mon Jul 22 15:33:48 2013 +0800
----------------------------------------------------------------------
ui/scripts/system.js | 35 +++++++++++++++++-----------------
ui/scripts/ui/widgets/listView.js | 22 ++++++++++++---------
2 files changed, 31 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39a730cc/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4da3511..eb15362 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10126,7 +10126,9 @@
jobId: jid
},
notification: {
- poll: pollAsyncJobResult
+ poll: pollAsyncJobResult,
+ interval: 4500,
+ desc: "Dedicate Pod"
},
data: item
@@ -10141,12 +10143,10 @@
});
}
- } else {
- args.response.success({
- data: item
- });
}
-
+ args.response.success({
+ data: item
+ });
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@@ -11226,7 +11226,9 @@
jobId: jid
},
notification: {
- poll: pollAsyncJobResult
+ poll: pollAsyncJobResult,
+ interval: 4500,
+ desc: "Dedicate Cluster"
},
data: $.extend(item, {
@@ -11240,11 +11242,10 @@
}
});
}
- } else {
- args.response.success({
- data: item
- });
}
+ args.response.success({
+ data: item
+ });
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@@ -12458,7 +12459,9 @@
jobId: jid
},
notification: {
- poll: pollAsyncJobResult
+ poll: pollAsyncJobResult,
+ interval: 4500,
+ desc: "Dedicate Host"
},
data: item
@@ -12472,12 +12475,10 @@
}
});
}
- } else {
- args.response.success({
- data: item
- });
}
-
+ args.response.success({
+ data: item
+ });
},
error: function(XMLHttpResponse) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39a730cc/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 4fd0b7f..a2d9063 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -185,6 +185,8 @@
return false;
});
+ if(args.notification) notification = args.notification;
+
notification._custom = args._custom;
if (additional && additional.success) additional.success(args);
@@ -250,25 +252,27 @@
// Error
- function(args) {
+ function(errorArgs) {
if (!isHeader) {
if ($instanceRow.data('list-view-new-item')) {
// For create forms
$instanceRow.remove();
} else {
// For standard actions
- replaceItem(
- $instanceRow,
- $.extend($instanceRow.data('json-obj'), args.data),
- args.actionFilter ?
- args.actionFilter :
- $instanceRow.data('list-view-action-filter')
- );
+ if(!args.notification) {
+ replaceItem(
+ $instanceRow,
+ $.extend($instanceRow.data('json-obj'), errorArgs.data),
+ errorArgs.actionFilter ?
+ errorArgs.actionFilter :
+ $instanceRow.data('list-view-action-filter')
+ );
+ }
}
}
if (options.error) {
- options.error(args);
+ options.error(errorArgs);
}
}
);