diff --git a/module/mr/model.php b/module/mr/model.php index b1b900ed44..52f247d1e2 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -113,6 +113,7 @@ class mrModel extends model if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError()); $MRID = $this->dao->lastInsertId(); + $this->loadModel('action')->create('mr', $MRID, 'opened'); $MRObject = new stdclass; $MRObject->target_project_id = $MR->targetProject; @@ -221,11 +222,12 @@ class mrModel extends model ->exec(); if(dao::isError()) return false; + $MRID = $this->dao->lastInsertId(); + $this->loadModel('action')->create('mr', $MRID, 'opened'); + /* Exec Job */ if($MR->hasNoConflict == '0' && $MR->mergeStatus == 'can_be_merged' && $MR->jobID) { - $MRID = $this->dao->lastInsertId(); - $extraParam = array(); if(!empty($repo->fileServerUrl)) $extraParam = array('ZENTAO_REPOPATH' => $repo->fileServerUrl);