Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#42376

Browse Source
This commit is contained in:
zenggang
2023-12-29 07:42:09 +00:00
parent 8f9ee8e497
commit 8d17d5270e
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/design/config/dtable.php
+2 -1
View File
@@ -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'] = 'RAWJS<function(val){return `#${val}`;}>RAWJS';
@@ -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');
module/design/model.php
+7
View File
@@ -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;
}
module/design/ui/linkcommit.html.php
+5
View File
@@ -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))
{