diff --git a/module/action/config.php b/module/action/config.php index 632d3a8fb5..479032c858 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -44,4 +44,4 @@ $config->action->majorList['project'] = array('opened', 'edited'); $config->action->majorList['execution'] = array('opened', 'edited'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; -$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,'; +$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,'; diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index d29da838b8..99c500d277 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -68,7 +68,9 @@ } else { - echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title={$action->objectName}"); + $app = ''; + if($action->objectType == 'meeting') $app = $action->project ? "data-app='project'" : "data-app='my'"; + echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title={$action->objectName} $app"); } ?>