* [ticket#1500,done,0.5h] finish ticket.
This commit is contained in:
@@ -26,6 +26,7 @@ window.onRenderCell = function(result, {row, col})
|
||||
}
|
||||
if(result && col.name == 'title')
|
||||
{
|
||||
if(!noFlowAuditModules.includes(row.data.module)) result[0].props['data-app'] = row.data.app;
|
||||
if(row.data.module == 'review' || !noFlowAuditModules.includes(row.data.module)) result[0].props['data-toggle'] = '';
|
||||
if(!viewPrivs[row.data.module])
|
||||
{
|
||||
|
||||
+1
-1
@@ -1186,7 +1186,7 @@ class myModel extends model
|
||||
|
||||
$this->loadModel('flow');
|
||||
$this->loadModel('workflowaction');
|
||||
$flows = $this->dao->select('module,`table`,name,titleField')->from(TABLE_WORKFLOW)->where('module')->in(array_keys($objectIdList))->fetchAll('module');
|
||||
$flows = $this->dao->select('module,`table`,name,titleField,app')->from(TABLE_WORKFLOW)->where('module')->in(array_keys($objectIdList))->fetchAll('module');
|
||||
$objectGroup = array();
|
||||
foreach($objectIdList as $objectType => $idList)
|
||||
{
|
||||
|
||||
@@ -314,6 +314,7 @@ class myTao extends myModel
|
||||
$data->type = $objectType;
|
||||
$data->time = $object->{$openedDateField};
|
||||
$data->status = 'doing';
|
||||
$data->app = $flows[$objectType]->app;
|
||||
$approvalList[] = $data;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user