diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php index be7b701435..96c2b57cb7 100644 --- a/module/design/config/dtable.php +++ b/module/design/config/dtable.php @@ -62,7 +62,7 @@ $config->design->linkcommit->dtable->fieldList['committer']['sortType'] = false; $config->design->linkcommit->dtable->fieldList['comment']['title'] = $lang->repo->comment; $config->design->linkcommit->dtable->fieldList['comment']['type'] = 'html'; $config->design->linkcommit->dtable->fieldList['comment']['sortType'] = false; -$config->design->linkcommit->dtable->fieldList['comment']['hint'] = true; +$config->design->linkcommit->dtable->fieldList['comment']['hint'] = '{commentHint}'; $config->design->viewcommit->dtable->fieldList['id']['title'] = $lang->design->submission; $config->design->viewcommit->dtable->fieldList['id']['format'] = 'RAWJSRAWJS'; @@ -80,6 +80,7 @@ $config->design->viewcommit->dtable->fieldList['time']['sortType'] = false; $config->design->viewcommit->dtable->fieldList['comment']['title'] = $lang->design->comment; $config->design->viewcommit->dtable->fieldList['comment']['type'] = 'html'; $config->design->viewcommit->dtable->fieldList['comment']['sortType'] = false; +$config->design->viewcommit->dtable->fieldList['comment']['hint'] = '{originalComment}'; $config->design->viewcommit->dtable->fieldList['actions']['type'] = 'actions'; $config->design->viewcommit->dtable->fieldList['actions']['menu'] = array('unlinkCommit'); diff --git a/module/design/model.php b/module/design/model.php index 25e0d5138e..b7a17811b7 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -345,6 +345,13 @@ class designModel extends model $design->product = (int)$design->product; $design->commit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->in($design->commit)->page($pager)->fetchAll('id'); + $this->loadModel('repo'); + foreach($design->commit as $commit) + { + $commit->originalComment = $commit->comment; + $commit->comment = $this->repo->replaceCommentLink($commit->comment); + } + return $design; } diff --git a/module/design/ui/linkcommit.html.php b/module/design/ui/linkcommit.html.php index 8e63abef1e..160ad04b7e 100644 --- a/module/design/ui/linkcommit.html.php +++ b/module/design/ui/linkcommit.html.php @@ -13,6 +13,11 @@ namespace zin; jsVar('designID', $designID); jsVar('errorDate', $lang->design->errorDate); +foreach($revisions as $revision) +{ + $revision->commentHint = strip_tags($revision->comment); +} + modalHeader(set::title($lang->design->linkCommit)); if(empty($repoID)) {