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/04 18:40:24 UTC
[1/2] git commit: updated refs/heads/4.3 to d34efd2
Updated Branches:
refs/heads/4.3 59c3006ff -> d34efd2dc
VR UI actions: Fix incorrect response object referenced on action complete
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1457fa1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1457fa1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1457fa1
Branch: refs/heads/4.3
Commit: c1457fa1a481f6c0be40db93e25bb27c770c5445
Parents: 59c3006
Author: Brian Federle <br...@citrix.com>
Authored: Wed Dec 4 09:38:47 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Dec 4 09:40:15 2013 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1457fa1/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9dd5190..0d8784f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2338,7 +2338,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -2384,7 +2384,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -3418,7 +3418,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -3464,7 +3464,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -3500,7 +3500,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -7659,7 +7659,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -7705,7 +7705,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
@@ -7804,7 +7804,7 @@
_custom: {
jobId: jid,
getUpdatedItem: function(json) {
- return json.queryasyncjobresultresponse.jobresult.domainrouter;
+ return json.queryasyncjobresultresponse.jobresult.router;
},
getActionFilter: function() {
return routerActionfilter;
[2/2] git commit: updated refs/heads/4.3 to d34efd2
Posted by bf...@apache.org.
Detail view: Fix error on refresh from async action
Fixes error on detail view actions when list view subsection has a custom ID
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d34efd2d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d34efd2d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d34efd2d
Branch: refs/heads/4.3
Commit: d34efd2dcb90e5dc1fec362461a4941712b607d0
Parents: c1457fa
Author: Brian Federle <br...@citrix.com>
Authored: Wed Dec 4 09:39:52 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Dec 4 09:40:16 2013 -0800
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d34efd2d/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 4c40ec8..3a3cd79 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -46,11 +46,13 @@
// Refresh detail view context
if ($detailView) {
- $.extend(
- $detailView.data('view-args').context[
- $detailView.data('view-args').section
- ][0], newData
- );
+ var detailViewArgs = $detailView.data('view-args');
+ var listViewArgs = $listView.data('view-args');
+ var contextID = listViewArgs.sections && listViewArgs.sections[detailViewArgs.section].id ?
+ listViewArgs.sections[detailViewArgs.section].id :
+ detailViewArgs.section;
+
+ $.extend($detailView.data('view-args').context[contextID][0], newData);
}
};