* [task#131813,doing,0.5h] adjust approval data logic for my module.

This commit is contained in:
caoyanyi
2024-11-11 10:03:28 +08:00
committed by 田淑杰
parent b87449b08e
commit 9d64406d9e
3 changed files with 18 additions and 6 deletions
+10
View File
@@ -17,3 +17,13 @@ $config->mobile->todoBar = array('today', 'yesterday', 'thisWeek', 'lastWeek',
$config->mobile->taskBar = array('assignedTo', 'openedBy');
$config->mobile->bugBar = array('assignedTo', 'openedBy', 'resolvedBy');
$config->mobile->storyBar = array('assignedTo', 'openedBy', 'reviewedBy');
$config->my->notFlowModules = array();
$config->my->openedDateField['product'] = 'createdDate';
$config->my->openedDateField['productplan'] = 'createdDate';
$config->my->openedDateField['release'] = 'createdDate';
$config->my->openedDateField['build'] = 'createdDate';
$config->my->openedDateField['testtask'] = 'createdDate';
$config->my->openedDateField['testsuite'] = 'addedDate';
$config->my->openedDateField['caselib'] = 'addedDate';
+6 -2
View File
@@ -1190,8 +1190,12 @@ class myModel extends model
$objectGroup = array();
foreach($objectIdList as $objectType => $idList)
{
if(!isset($flows[$objectType])) continue;
$table = zget($this->config->objectTables, $objectType, $flows[$objectType]->table);
$table = zget($this->config->objectTables, $objectType, '');
if(!in_array($objectType, $this->config->my->notFlowModules))
{
if(!isset($flows[$objectType])) continue;
if(!$table) $table = $flows[$objectType]->table;
}
if(empty($table)) continue;
$objectGroup[$objectType] = $this->dao->select('*')->from($table)->where('id')->in($idList)->fetchAll('id');
+2 -4
View File
@@ -298,9 +298,7 @@ class myTao extends myModel
{
$title = '';
$titleFieldName = zget($objectNameFields, $objectType, '');
$openedDateField = 'openedDate';
if(in_array($objectType, array('product', 'productplan', 'release', 'build', 'testtask'))) $openedDateField = 'createdDate';
if(in_array($objectType, array('testsuite', 'caselib')))$openedDateField = 'addedDate';
$openedDateField = zget($this->config->my->openedDateField, $objectType, 'openedDate');
if(empty($titleFieldName) && isset($flows[$objectType]))
{
if(!empty($flows[$objectType]->titleField)) $titleFieldName = $flows[$objectType]->titleField;
@@ -316,7 +314,7 @@ class myTao extends myModel
$data->type = $objectType;
$data->time = $object->{$openedDateField};
$data->status = 'doing';
$data->app = $flows[$objectType]->app;
$data->app = isset($flows[$objectType]->app) ? $flows[$objectType]->app : zget($this->lang->navGroup, $objectType, '');
$approvalList[] = $data;
}
}