You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/09/28 13:25:22 UTC
[33/50] [abbrv] ambari git commit: AMBARI-22041 - Intermittent bug in
AMBARI-21933 patch causing wizard progress reporting to sometimes hang (Jason
Golieb via jonathanhurley)
AMBARI-22041 - Intermittent bug in AMBARI-21933 patch causing wizard progress reporting to sometimes hang (Jason Golieb via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb27cee5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb27cee5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb27cee5
Branch: refs/heads/branch-3.0-perf
Commit: cb27cee531f9321e87e2a32fcfa9879a1439340a
Parents: 1a90a52
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Sep 26 14:52:41 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Sep 26 14:52:41 2017 -0400
----------------------------------------------------------------------
.../main/admin/highAvailability/progress_popup_controller.js | 2 +-
.../admin/highAvailability/progress_popup_controller_test.js | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb27cee5/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
index 6e0ee5e..9d8f33e 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
@@ -180,7 +180,7 @@ App.HighAvailabilityProgressPopupController = Ember.Controller.extend({
var hosts = [];
var hostsMap = {};
var popupTitle = this.get('popupTitle');
- var id = data[0].Requests.id;
+ var id = this.get('requestIds')[0];
data.forEach(function (request) {
request.tasks.forEach(function (task) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb27cee5/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js b/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
index 2742c44..b14bf86 100644
--- a/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
@@ -343,9 +343,6 @@ describe('App.HighAvailabilityProgressPopupController', function () {
it("calculate data", function() {
var data = [
{
- Requests: {
- id: 1
- },
tasks: [
{
Tasks: {
@@ -363,6 +360,7 @@ describe('App.HighAvailabilityProgressPopupController', function () {
}
];
controller.setProperties({
+ requestIds: [1],
popupTitle: 'popupTitle'
});
controller.calculateHostsData(data);