bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更改view::addPaginator的调用参数

This commit is contained in:
Li Jianxuan 2013-09-29 07:02:23 +00:00
parent 3f303c9b10
commit 579a204c0f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/admin/controllers/DataController.php
View File

@ -1123,9 +1123,15 @@ class Admin_DataController extends Zend_Controller_Action
{
$this->view->ac = $ac = $this->_getParam('ac');
$submit = $this->_getParam('submit');
$keyword = $this->view->q = trim($this->_getParam('q'));
$reference = new Reference();
if(!empty($keyword))
{
$reference->keyword = $keyword;
}
//文献首页
if(empty($ac))
{
@ -3520,13 +3526,13 @@ class Admin_DataController extends Zend_Controller_Action
if(empty($uuid))
{
$rows = $fund->fetch(NULL,true,0,$keyword);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
}else{
include('data/Metadata.php');
$md = new Metadata($this->db);
$this->view->md = $md->view($uuid);
$rows = $fund->fetch($uuid);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
}
return true;
}
@ -3536,7 +3542,7 @@ class Admin_DataController extends Zend_Controller_Action
$this->_helper->viewRenderer('fund-data-list');
$this->view->q = $q = $this->_getParam('q');
$rows = $fund->fetchFromData(true,0,$q);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
return true;
}
@ -3547,7 +3553,7 @@ class Admin_DataController extends Zend_Controller_Action
$id = $this->_getParam('id');
$this->view->fund = $fund->view($id);
$rows = $fund->fetchFromData($id,0,$q);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
return true;
}
@ -3679,7 +3685,7 @@ class Admin_DataController extends Zend_Controller_Action
$md = new Metadata($this->db);
$this->view->md = $md->view($uuid);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
return true;
}//formd
@ -3727,7 +3733,7 @@ class Admin_DataController extends Zend_Controller_Action
}
$rows = $fund->getData($id,$keyword);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
}
}//fund
@ -3748,7 +3754,7 @@ class Admin_DataController extends Zend_Controller_Action
if(empty($uuid))
{
$rows = $doi->fetch(0,$q);
view::addPaginator($rows,$this->view,$this->_request);
view::addPaginator($rows,$this,10);
}else{
$this->_redirect('/admin/data/doi/ac/edit/?uuid='.$uuid);
return true;