浏览代码

AMBARI-1376. Wrong calculation of duration filter on apps page. (jaimin via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1445452 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父节点
当前提交
bf1f46c9a8
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 3 0
      CHANGES.txt
  2. 2 3
      ambari-web/app/controllers/main/apps_controller.js

+ 3 - 0
CHANGES.txt

@@ -271,6 +271,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1376. Wrong calculation of duration filter on apps page. (jaimin via
+ yusaku)
+
  AMBARI-1165. Change the dashboard graph for HBase since its using cumulative
  metrics. (yusaku)
 

+ 2 - 3
ambari-web/app/controllers/main/apps_controller.js

@@ -72,7 +72,6 @@ App.MainAppsController = Em.ArrayController.extend({
    */
   iTotalDisplayRecordsObserver:function(){
     if(this.get("filterObject.allFilterActivated")){
-      //this.set("paginationObject.filteredDisplayRecords","-10");
       this.set("filterObject.allFilterActivated", false);
     }else{
       this.set("filterObject.filteredDisplayRecords",this.get("paginationObject.iTotalDisplayRecords"));
@@ -202,8 +201,8 @@ App.MainAppsController = Em.ArrayController.extend({
         tmp.max = Math.floor((parseFloat(compareValue)+0.01)*1000);
         break;
         default:
-          tmp.min = Math.max(1024,Math.ceil((compareValue-0.05)*1024));
-          tmp.max = Math.min(1048575,Math.floor((compareValue+0.05)*1024));
+          tmp.min = Math.ceil((parseFloat(compareValue)-0.01)*1000);
+          tmp.max = Math.floor((parseFloat(compareValue)+0.01)*1000);
       }
       switch (compareChar) {
         case '<':