You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2015/09/25 02:43:05 UTC
[1/2] ambari git commit: AMBARI-12879. Warn the user about HDFS
Upgrade not finalized in Ambari Web UI (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 23bf111a0 -> bc94537f7
AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI <fix3> (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1f697a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1f697a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1f697a8
Branch: refs/heads/trunk
Commit: e1f697a866a7b425dead3186b49ba5c281f4a001
Parents: 23bf111
Author: Richard Zang <rz...@apache.org>
Authored: Wed Sep 23 14:07:51 2015 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Thu Sep 24 17:21:31 2015 -0700
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller_test.js | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f697a8/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index a7bfa98..880976f 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -849,7 +849,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* @method updateFinalizeSuccessCallback
*/
updateFinalizeSuccessCallback: function (data) {
- var context = data ? Em.get(data, 'upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : '';
+ var context = data ? Em.get(data, 'items.firstObject.upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : '';
this.set('isFinalizeItem', context === this.get('finalizeContext'));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f697a8/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 5a1a500..b034ac4 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1169,14 +1169,18 @@ describe('App.MainAdminStackAndUpgradeController', function() {
it('data exists and Finalize should be true', function() {
var data = {
- upgrade_groups: [
+ items: [
{
- upgrade_items: [
+ upgrade_groups: [
{
- UpgradeItem: {
- context: controller.get('finalizeContext'),
- status: "HOLDING"
- }
+ upgrade_items: [
+ {
+ UpgradeItem: {
+ context: controller.get('finalizeContext'),
+ status: "HOLDING"
+ }
+ }
+ ]
}
]
}
[2/2] ambari git commit: AMBARI-13235. Incorrect Hosts table
filtering after navigating back from Host Summary (rzang)
Posted by rz...@apache.org.
AMBARI-13235. Incorrect Hosts table filtering after navigating back from Host Summary (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc94537f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc94537f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc94537f
Branch: refs/heads/trunk
Commit: bc94537f7c32efc094b012573ff457d12e1fdca7
Parents: e1f697a
Author: Richard Zang <rz...@apache.org>
Authored: Thu Sep 24 17:41:31 2015 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Thu Sep 24 17:41:31 2015 -0700
----------------------------------------------------------------------
ambari-web/app/mappers/hosts_mapper.js | 5 ++++-
ambari-web/app/views/common/sort_view.js | 30 ++++++++++++++++++---------
2 files changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc94537f/ambari-web/app/mappers/hosts_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
index ed9ef26..53f536c 100644
--- a/ambari-web/app/mappers/hosts_mapper.js
+++ b/ambari-web/app/mappers/hosts_mapper.js
@@ -153,7 +153,10 @@ App.hostsMapper = App.QuickDataMapper.create({
var alertsSummary = item.alerts_summary;
item.critical_warning_alerts_count = alertsSummary ? (alertsSummary.CRITICAL || 0) + (alertsSummary.WARNING || 0) : 0;
item.cluster_id = clusterName;
- item.index = index;
+ var existingHost = App.Host.find().findProperty('hostName', component.host_name);
+ var fromHostDetail = App.router.get('currentState.parentState.name') == 'hostDetails';
+ // There is no need to override existing index in host detail view since old model(already have indexes) will not be cleared.
+ item.index = (existingHost && fromHostDetail)? existingHost.get('index'): index;
if (stackUpgradeSupport) {
this.config = $.extend(this.config, {
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc94537f/ambari-web/app/views/common/sort_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/sort_view.js b/ambari-web/app/views/common/sort_view.js
index 7ed4c72..ff46b55 100644
--- a/ambari-web/app/views/common/sort_view.js
+++ b/ambari-web/app/views/common/sort_view.js
@@ -203,18 +203,28 @@ var serverWrapperView = Em.View.extend({
* Initialize and save sorting statuses: hostName sorting_asc
*/
loadSortStatuses: function () {
- var statuses = [];
var childViews = this.get('childViews');
- childViews.forEach(function (childView) {
- var sortStatus = (childView.get('name') == 'hostName' && childView.get('status') == 'sorting') ? 'sorting_asc' : childView.get('status');
- statuses.push({
- name: childView.get('name'),
- status: sortStatus
+ var statuses = App.db.getSortingStatuses(this.get('controller.name'));
+ if (statuses) {
+ var sortingColumn = App.db.getSortingStatuses(this.get('controller.name')).find(function(column){ return column.status != 'sorting'})
+ if (sortingColumn) {
+ var sortingColumnView = childViews.findProperty('name', sortingColumn.name);
+ sortingColumnView.set('status', sortingColumn.status);
+ this.get('controller').set('sortingColumn', sortingColumnView);
+ }
+ } else {
+ statuses = [];
+ childViews.forEach(function (childView) {
+ var sortStatus = (childView.get('name') == 'hostName' && childView.get('status') == 'sorting') ? 'sorting_asc' : childView.get('status');
+ statuses.push({
+ name: childView.get('name'),
+ status: sortStatus
+ });
+ childView.set('status', sortStatus);
});
- childView.set('status', sortStatus);
- });
- App.db.setSortingStatuses(this.get('controller.name'), statuses);
- this.get('controller').set('sortingColumn', childViews.findProperty('name', 'hostName'));
+ App.db.setSortingStatuses(this.get('controller.name'), statuses);
+ this.get('controller').set('sortingColumn', childViews.findProperty('name', 'hostName'));
+ }
},
/**