diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php index e7afec2fd0..869adaf2ef 100644 --- a/module/design/config/dtable.php +++ b/module/design/config/dtable.php @@ -65,7 +65,7 @@ $config->design->linkcommit->dtable->fieldList['comment']['sortType'] = false; $config->design->viewcommit->dtable->fieldList['id']['title'] = $lang->design->submission; $config->design->viewcommit->dtable->fieldList['id']['format'] = 'RAWJSRAWJS'; -$config->design->viewcommit->dtable->fieldList['id']['link'] = helper::createLink('design', 'revision', 'repoID={id}'); +$config->design->viewcommit->dtable->fieldList['id']['link'] = array('url' => helper::createLink('design', 'revision', 'repoID={id}'), 'target' => '_blank'); $config->design->viewcommit->dtable->fieldList['id']['target'] = '_blank'; $config->design->viewcommit->dtable->fieldList['id']['sortType'] = false; diff --git a/module/design/control.php b/module/design/control.php index 1ea9588be1..2fdf1d8b01 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -136,7 +136,7 @@ class design extends control $response['result'] = 'success'; $response['message'] = $this->lang->saveSuccess; - $response['locate'] = $this->createLink('design', 'browse', "projectID=$projectID&productID=$productID"); + $response['load'] = $this->createLink('design', 'browse', "projectID={$projectID}&productID={$productID}"); return $this->send($response); } @@ -407,11 +407,10 @@ class design extends control * @access public * @return void */ - public function revision($repoID = 0, $projectID = 0) + public function revision(int $repoID = 0, int $projectID = 0) { - $repo = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->eq($repoID)->fetch(); - $repoURL = $this->createLink('repo', 'revision', "repoID=$repo->repo&objectID=$projectID&revistion=$repo->revision"); - header("location:" . $repoURL); + $repo = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->eq($repoID)->fetch(); + $this->locate(helper::createLink('repo', 'revision', "repoID={$repo->repo}&objectID={$projectID}&revistion={$repo->revision}")); } /**