Minahito
minah****@users*****
2006年 5月 17日 (水) 18:36:04 JST
Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.8
--- xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.7 Wed May 17 16:21:27 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php Wed May 17 18:36:04 2006
@@ -62,42 +62,15 @@
$this->mModule =& $handler->getByDirname(xoops_getrequest('tpl_module'));
}
- if (isset($_REQUEST['tpl_tplset'])) {
- $this->_mNavi->addExtra('tpl_tplset', xoops_getrequest('tpl_tplset'));
-
- //
- // For the procedure of override, must load 'default' template-set here.
- // The template of the specified template-set will be loaded in Tplset Object.
- // See business-logic.
- //
- $this->_mCriteria->add(new Criteria('tpl_tplset', 'default'));
-
- $handler =& xoops_getmodulehandler('tplset');
- $tplsets =& $handler->getObjects(new Criteria('tplset_name', xoops_getrequest('tpl_tplset')));
- if (count($tplsets) > 0) {
- $this->mTplset =& $tplsets[0];
- }
- }
-
- if (isset($_REQUEST['tpl_file'])) {
- $this->_mNavi->addExtra('tpl_file', xoops_getrequest('tpl_file'));
- $this->_mCriteria->add(new Criteria('tpl_file', array(XOBJ_DTYPE_STRING, "%" . xoops_getrequest('tpl_file') . "%"), 'LIKE'));
- }
-
if (isset($_REQUEST['tpl_type'])) {
$this->_mNavi->addExtra('tpl_type', xoops_getrequest('tpl_type'));
$this->_mCriteria->add(new Criteria('tpl_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('tpl_type'))));
}
- $this->_mNavi->addExtra('sort', $this->mSort);
-
//
- // check filtering criterion and if module & tplset specified mode, then remove paging function.
+ // @todo We can remove the following code:
//
- if ($this->mModule != null && $this->mTplset != null) {
- $this->_mNavi->setPerpage(0);
- $this->_mNavi->freezePerpage();
- }
+ $this->_mNavi->addExtra('sort', $this->mSort);
}
function getSort()