You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/22 10:46:29 UTC
[2/3] ambari git commit: AMBARI-11321. Phoenix Query Servers link
wrong navigation (alexantonenko)
AMBARI-11321. Phoenix Query Servers link wrong navigation (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53c80e82
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53c80e82
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53c80e82
Branch: refs/heads/trunk
Commit: 53c80e82c24d33ec2127e04ffcf1a0efdbf6be2c
Parents: c0478e8
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri May 22 01:17:09 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri May 22 11:45:57 2015 +0300
----------------------------------------------------------------------
ambari-web/app/templates/main/service/services/hbase.hbs | 2 +-
.../views/main/admin/stack_upgrade/upgrade_wizard_view_test.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/53c80e82/ambari-web/app/templates/main/service/services/hbase.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/services/hbase.hbs b/ambari-web/app/templates/main/service/services/hbase.hbs
index 5503929..1ed96dd 100644
--- a/ambari-web/app/templates/main/service/services/hbase.hbs
+++ b/ambari-web/app/templates/main/service/services/hbase.hbs
@@ -34,7 +34,7 @@
<!-- PhoenixServers -->
{{#if view.showPhoenixInfo}}
<tr>
- <td class="summary-label"><a href="#" {{action filterHosts view.regionServerComponent}}>{{t dashboard.services.hbase.phoenixServers}}</a>
+ <td class="summary-label"><a href="#" {{action filterHosts view.phoenixServerComponent}}>{{t dashboard.services.hbase.phoenixServers}}</a>
</td>
<td>
<span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/53c80e82/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index b45c320..5f47a52 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -644,7 +644,7 @@ describe('App.upgradeWizardView', function () {
});
});
- describe.skip('#getSkippedServiceChecks()', function () {
+ describe('#getSkippedServiceChecks()', function () {
var cases = [
{
@@ -655,10 +655,10 @@ describe('App.upgradeWizardView', function () {
title: 'no ajax request should be sent away from Finalize step'
},
{
- isFinalizeItem: false,
+ isFinalizeItem: true,
areSkippedServiceChecksLoaded: true,
ajaxSendCallCount: 0,
- areSkippedServiceChecksLoadedResult: false,
+ areSkippedServiceChecksLoadedResult: true,
title: 'no ajax request should be sent if data is already loaded'
},
{