You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/02/13 02:28:27 UTC

svn commit: r1445452 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/apps_controller.js

Author: yusaku
Date: Wed Feb 13 01:28:26 2013
New Revision: 1445452

URL: http://svn.apache.org/r1445452
Log:
AMBARI-1376. Wrong calculation of duration filter on apps page. (jaimin via yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1445452&r1=1445451&r2=1445452&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 13 01:28:26 2013
@@ -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)
 

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js?rev=1445452&r1=1445451&r2=1445452&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js Wed Feb 13 01:28:26 2013
@@ -72,7 +72,6 @@ App.MainAppsController = Em.ArrayControl
    */
   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.ArrayControl
         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 '<':