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 2014/07/03 20:12:10 UTC
[1/2] git commit: AMBARI-6375. Maintenance mode: canNOT be turned on
via Bulk Operations on selected hosts (other bulk operations are broken as
well) (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 473e40e6b -> 9360e30ea
AMBARI-6375. Maintenance mode: canNOT be turned on via Bulk Operations on selected hosts (other bulk operations are broken as well) (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47ff163e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47ff163e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47ff163e
Branch: refs/heads/branch-1.6.1
Commit: 47ff163ef0156260ea39e1e32358b5258b815973
Parents: 473e40e
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jul 3 17:44:39 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jul 3 20:21:32 2014 +0300
----------------------------------------------------------------------
ambari-web/app/views/main/host.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/47ff163e/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 045a6f2..50123bb 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -387,7 +387,7 @@ App.MainHostView = App.TableView.extend(App.TableServerProvider, {
var queryParams = [];
switch(selection) {
case 's':
- hostsNames = App.db.data.app.tables.filterConditions[this.get('controller.name')].findProperty('iColumn', 10).value;
+ hostsNames = this.get('selectedHosts');
if(hostsNames.length > 0){
queryParams.push({
key: 'Hosts/host_name',
[2/2] git commit: AMBARI-6382. cannot select hosts across pages
(alexantonenko)
Posted by al...@apache.org.
AMBARI-6382. cannot select hosts across pages (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9360e30e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9360e30e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9360e30e
Branch: refs/heads/branch-1.6.1
Commit: 9360e30eab5f0ca086f5a925086747f00631806c
Parents: 47ff163
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jul 3 20:29:20 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jul 3 20:29:20 2014 +0300
----------------------------------------------------------------------
ambari-web/app/views/main/host.js | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9360e30e/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 50123bb..c20994c 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -286,7 +286,8 @@ App.MainHostView = App.TableView.extend(App.TableServerProvider, {
* combine selected hosts on page with selected hosts which are filtered out but added to cluster
*/
combineSelectedFilter: function () {
- var previouslySelectedHosts = this.getSelectedFilter();
+ var controllerName = this.get('controller.name');
+ var previouslySelectedHosts = App.db.getSelectedHosts(controllerName);
var selectedHosts = [];
var hostsOnPage = this.get('pageContent').mapProperty('hostName');
selectedHosts = this.get('pageContent').filterProperty('selected').mapProperty('hostName');
@@ -308,24 +309,6 @@ App.MainHostView = App.TableView.extend(App.TableServerProvider, {
},
/**
- * get selected filter previous value
- * @return {Array}
- */
- getSelectedFilter: function() {
- var filterCondition = this.get('filterConditions').findProperty('iColumn', 10);
- var dbFilterConditions = App.db.getFilterConditions(this.get('controller.name'));
- var selectedFilter = [];
-
- if (filterCondition) {
- selectedFilter = filterCondition.value;
- }
- else if (dbFilterConditions && dbFilterConditions.findProperty('iColumn', 10)) {
- selectedFilter = dbFilterConditions.findProperty('iColumn', 10).value;
- }
- return selectedFilter;
- },
-
- /**
* Show spinner when filter/sorting request is in processing
* @method overlayObserver
*/