mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
尘缘
2016-05-09 18:06:52 +08:00
parent 6786e8d9ab 4600c3179e
commit 3868b6e771
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/Paginator.php
View File

@@ -60,6 +60,7 @@ abstract class Paginator
$this->hasMore = count($this->items) > ($this->listRows); $this->hasMore = count($this->items) > ($this->listRows);
$this->items = $this->items->slice(0, $this->listRows); $this->items = $this->items->slice(0, $this->listRows);
} else { } else {
$this->total = $total;
$this->lastPage = (int)ceil($total / $listRows); $this->lastPage = (int)ceil($total / $listRows);
$this->currentPage = $this->setCurrentPage($currentPage); $this->currentPage = $this->setCurrentPage($currentPage);
$this->hasMore = $this->currentPage < $this->lastPage; $this->hasMore = $this->currentPage < $this->lastPage;

4
library/think/console/command/Build.php
View File

@@ -24,8 +24,8 @@ class Build extends Command
protected function configure() protected function configure()
{ {
$this->setName('build') $this->setName('build')
->setDefinition([new Option('config', null, Option::VALUE_OPTIONAL, "build.php path", APP_PATH . 'build.php')]) ->setDefinition([new Option('config', null, Option::VALUE_OPTIONAL, "build.php path")])
->setDefinition([new Option('module', null, Option::VALUE_OPTIONAL, "module name", 'index')]) ->setDefinition([new Option('module', null, Option::VALUE_OPTIONAL, "module name")])
->setDescription('Build Application Dirs'); ->setDescription('Build Application Dirs');
} }