diff --git a/module/my/js/audit.ui.js b/module/my/js/audit.ui.js index 6241be6134..b6004f977a 100644 --- a/module/my/js/audit.ui.js +++ b/module/my/js/audit.ui.js @@ -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]) { diff --git a/module/my/model.php b/module/my/model.php index 2800bc033a..d97e86eade 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -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) { diff --git a/module/my/tao.php b/module/my/tao.php index d4b6e6b347..f6404c3c8e 100644 --- a/module/my/tao.php +++ b/module/my/tao.php @@ -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; } }