Преглед на файлове

Merge branch 'cherry-pick-9b6fd4de' into 'fix/homepage_forword_page'

修复首页翻页bug

See merge request o2oa/o2oa!478
胡起 преди 6 години
родител
ревизия
9eef4e1754
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      o2web/source/x_component_Homepage/InforContent.js
  2. 1 1
      o2web/source/x_component_Homepage/TaskContent.js

+ 1 - 1
o2web/source/x_component_Homepage/InforContent.js

@@ -462,7 +462,7 @@ MWF.xApplication.Homepage.InforContent.AllInfor = new Class({
         var range = this.getCurrentPageRange();
         var beginNumber = range.endNumber+1;
         var endNumber = beginNumber+(this.options.showPages-1);
-        if (beginNumber>this.pages) endNumber = this.pages;
+        if (beginNumber>=this.pages) endNumber = this.pages;
         this.page = endNumber-((this.options.showPages/2).toInt());
         this.reloadItem();
     }

+ 1 - 1
o2web/source/x_component_Homepage/TaskContent.js

@@ -501,7 +501,7 @@ MWF.xApplication.Homepage.TaskContent.Task = new Class({
         var range = this.getCurrentPageRange();
         var beginNumber = range.endNumber+1;
         var endNumber = beginNumber+(this.options.showPages-1);
-        if (beginNumber>this.pages) endNumber = this.pages;
+        if (beginNumber>=this.pages) endNumber = this.pages;
         this.page = endNumber-((this.options.showPages/2).toInt());
         this.reload();
     }