* Adjust attend review.
This commit is contained in:
+4
-1
@@ -1256,7 +1256,10 @@ class myModel extends model
|
||||
}
|
||||
else
|
||||
{
|
||||
$objectGroup[$objectType] = $this->dao->select('*')->from($table)->where('id')->in($idList)->andWhere('deleted')->eq('0')->fetchAll('id');
|
||||
$objectGroup[$objectType] = $this->dao->select('*')->from($table)
|
||||
->where('id')->in($idList)
|
||||
->beginIF(strpos(',attend,overtime,makeup,leave,lieu,', ",{$objectType},") === false)->andWhere('deleted')->eq('0')->fi()
|
||||
->fetchAll('id');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,11 @@ foreach($reviewList as $review)
|
||||
|
||||
$statusList = array();
|
||||
if(isset($lang->$type->statusList)) $statusList = $lang->$type->statusList;
|
||||
if($type == 'attend') $statusList = $lang->attend->reviewStatusList;
|
||||
if($type == 'attend')
|
||||
{
|
||||
$this->app->loadLang('attend');
|
||||
$statusList = $lang->attend->reviewStatusList;
|
||||
}
|
||||
|
||||
if(!in_array($type, array('demand', 'story', 'testcase', 'feedback', 'review')) && !$isOAObject)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user