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/06/05 19:04:15 UTC
svn commit: r1489961 -
/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js
Author: yusaku
Date: Wed Jun 5 17:04:15 2013
New Revision: 1489961
URL: http://svn.apache.org/r1489961
Log:
AMBARI-2291. Incorrect behavior of jobs paging. (Oleg Nechiporenko via yusaku)
Modified:
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js?rev=1489961&r1=1489960&r2=1489961&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/apps_controller.js Wed Jun 5 17:04:15 2013
@@ -370,12 +370,15 @@ App.MainAppsController = Em.ArrayControl
runTimeout : null,
valueObserver: function(){
+ if(this.get('filterObject.iDisplayLength') > this.get('content.length')) {
+ this.set('filterObject.iDisplayStart', 0);
+ }
var link = this.get('filterObject').createAppLink();
if(this.get("filterObject.viewType") == "filtered"){
this.set("runUrl", link);
}else{
- this.set("runUrl", "/jobhistory/datatable?iDisplayLength="+this.get('filterObject.iDisplayLength'));
+ this.set("runUrl", "/jobhistory/datatable?iDisplayStart="+this.get('filterObject.iDisplayStart')+"&iDisplayLength="+this.get('filterObject.iDisplayLength'));
}
var timeout = this.get('runTimeout');