Minahito
minah****@users*****
2006年 4月 11日 (火) 15:26:19 JST
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u 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.5
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.4 Tue Apr 11 15:12:45 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php Tue Apr 11 15:26:19 2006
@@ -35,20 +35,13 @@
NEWBLOCKS_SORT_KEY_BID => 'bid',
NEWBLOCKS_SORT_KEY_MID => 'mid',
NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
- NEWBLOCKS_SORT_KEY_OPTIONS => 'options',
NEWBLOCKS_SORT_KEY_NAME => 'name',
NEWBLOCKS_SORT_KEY_TITLE => 'title',
- NEWBLOCKS_SORT_KEY_CONTENT => 'content',
NEWBLOCKS_SORT_KEY_SIDE => 'side',
NEWBLOCKS_SORT_KEY_WEIGHT => 'weight',
- NEWBLOCKS_SORT_KEY_VISIBLE => 'visible',
NEWBLOCKS_SORT_KEY_BLOCK_TYPE => 'block_type',
NEWBLOCKS_SORT_KEY_C_TYPE => 'c_type',
- NEWBLOCKS_SORT_KEY_ISACTIVE => 'isactive',
NEWBLOCKS_SORT_KEY_DIRNAME => 'dirname',
- NEWBLOCKS_SORT_KEY_FUNC_FILE => 'func_file',
- NEWBLOCKS_SORT_KEY_SHOW_FUNC => 'show_func',
- NEWBLOCKS_SORT_KEY_EDIT_FUNC => 'edit_func',
NEWBLOCKS_SORT_KEY_TEMPLATE => 'template',
NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime',
NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified'
@@ -111,8 +104,16 @@
$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1)));
$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+ //
+ // Set sort conditions.
+ //
$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
- $this->_mCriteria->addSort('weight', $this->getOrder());
+ if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_SIDE) {
+ $this->_mCriteria->addSort('side', $this->getOrder());
+ }
+ if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_WEIGHT) {
+ $this->_mCriteria->addSort('weight', $this->getOrder());
+ }
}
}