ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-6382. cannot select hosts across pages (alexantonenko)
Date Thu, 03 Jul 2014 18:23:46 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5c350746b -> 22a8a0bfa


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/22a8a0bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22a8a0bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22a8a0bf

Branch: refs/heads/trunk
Commit: 22a8a0bfa1c61df90ed2167f13dce65065fc92f7
Parents: 5c35074
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Jul 3 21:23:36 2014 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Jul 3 21:23:36 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/22a8a0bf/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
    */


Mime
View raw message