Minahito
minah****@users*****
2006年 4月 11日 (火) 15:12:45 JST
Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.2 Tue Mar 28 22:29:05 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Tue Apr 11 15:12:45 2006
@@ -52,6 +52,8 @@
if (isset($_REQUEST['display'])) {
$this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display'))));
}
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
}
}
Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3 Tue Apr 11 14:41:58 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php Tue Apr 11 15:12:45 2006
@@ -32,7 +32,6 @@
{
var $mSort = 0;
var $_mSortKeys = array(
- NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
NEWBLOCKS_SORT_KEY_BID => 'bid',
NEWBLOCKS_SORT_KEY_MID => 'mid',
NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
@@ -86,6 +85,8 @@
$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 0)));
$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
}
}
Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.4 Wed Mar 29 00:14:05 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php Tue Apr 11 15:12:45 2006
@@ -4,7 +4,6 @@
require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
-define('COMMENT_SORT_KEY_DEFAULT', 0);
define('COMMENT_SORT_KEY_COM_ID', 1);
define('COMMENT_SORT_KEY_COM_PID', 2);
define('COMMENT_SORT_KEY_COM_ROOTID', 3);
@@ -27,11 +26,12 @@
define('COMMENT_SORT_KEY_DOBR', 20);
define('COMMENT_SORT_KEY_MAXVALUE', 20);
+define('COMMENT_SORT_KEY_DEFAULT', COMMENT_SORT_KEY_COM_ID);
+
class Legacy_CommentFilterForm extends Legacy_AbstractFilterForm
{
var $mSort = 0;
var $_mSortKeys = array(
- COMMENT_SORT_KEY_DEFAULT => 'com_id',
COMMENT_SORT_KEY_COM_ID => 'com_id',
COMMENT_SORT_KEY_COM_PID => 'com_pid',
COMMENT_SORT_KEY_COM_ROOTID => 'com_rootid',
@@ -96,6 +96,8 @@
$this->_mNavi->addExtra('com_status', xoops_getrequest('com_status'));
$this->_mCriteria->add(new Criteria('com_status', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_status'))));
}
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
}
}
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3 Tue Apr 11 14:41:58 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php Tue Apr 11 15:12:45 2006
@@ -110,6 +110,9 @@
$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1)));
$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
+ $this->_mCriteria->addSort('weight', $this->getOrder());
}
}