diff --git a/module/repo/config/dtable.php b/module/repo/config/dtable.php index 338fc7c5ab..95fd89236c 100644 --- a/module/repo/config/dtable.php +++ b/module/repo/config/dtable.php @@ -273,17 +273,28 @@ $config->repo->dtable->tag->fieldList['name']['type'] = 'title'; $config->repo->dtable->tag->fieldList['name']['name'] = 'name'; $config->repo->dtable->tag->fieldList['name']['order'] = 10; +$config->repo->dtable->tag->fieldList['message']['title'] = $lang->repo->comment; +$config->repo->dtable->tag->fieldList['message']['type'] = 'text'; +$config->repo->dtable->tag->fieldList['message']['order'] = 30; + +$config->repo->dtable->tag->fieldList['commitID']['title'] = $lang->repo->sourceCommit; +$config->repo->dtable->tag->fieldList['commitID']['link'] = helper::createLink('repo', 'revision', 'repoID={repoID}&objectID=0&revision={commitID}'); +$config->repo->dtable->tag->fieldList['commitID']['data-app'] = $app->tab; +$config->repo->dtable->tag->fieldList['commitID']['type'] = 'text'; +$config->repo->dtable->tag->fieldList['commitID']['sortType'] = true; +$config->repo->dtable->tag->fieldList['commitID']['order'] = 40; + $config->repo->dtable->tag->fieldList['committer']['title'] = $lang->repo->lastCommitter; $config->repo->dtable->tag->fieldList['committer']['type'] = 'text'; $config->repo->dtable->tag->fieldList['committer']['sortType'] = true; -$config->repo->dtable->tag->fieldList['committer']['order'] = 20; +$config->repo->dtable->tag->fieldList['committer']['order'] = 50; -$config->repo->dtable->tag->fieldList['date']['title'] = $lang->repo->lastUpdateTime; +$config->repo->dtable->tag->fieldList['date']['title'] = $lang->repo->time; $config->repo->dtable->tag->fieldList['date']['name'] = 'date'; $config->repo->dtable->tag->fieldList['date']['type'] = 'datetime'; $config->repo->dtable->tag->fieldList['date']['width'] = 300; $config->repo->dtable->tag->fieldList['date']['formatDate'] = 'YYYY-MM-dd hh:mm'; -$config->repo->dtable->tag->fieldList['date']['order'] = 40; +$config->repo->dtable->tag->fieldList['date']['order'] = 60; $config->repo->dtable->branch = new stdclass(); $config->repo->dtable->branch->fieldList['name']['title'] = $lang->repo->branch; diff --git a/module/repo/control.php b/module/repo/control.php index 9b78a7e49a..50cd86f612 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1819,10 +1819,17 @@ class repo extends control { $tag->repoID = $repoID; $tag->tagName = urlencode(helper::safe64Encode($tag->name)); + + $tag->commitID = isset($tag->commit->id) ? $tag->commit->id : ''; + if(isset($tag->commit->sha)) $tag->commitID = $tag->commit->sha; + $tag->commitID = substr($tag->commitID, 0, 10); + $tag->committer = isset($tag->commit->author_name) ? $tag->commit->author_name : ''; - if(isset($tag->tagger->identity->name)) $tag->committer = $tag->tagger->identity->name; + if(isset($tag->commit->author->identity->name)) $tag->committer = $tag->commit->author->identity->name; $tag->committer = zget($committers, $tag->committer); + $tag->createdBy = isset($tag->tagger->identity->name) ? zget($committers, $tag->tagger->identity->name) : ''; + $tag->date = isset($tag->commit->committed_date) ? date('Y-m-d H:i:s', strtotime($tag->commit->committed_date)) : ''; if(isset($tag->tagger->when)) $tag->date = date('Y-m-d H:i:s', strtotime($tag->tagger->when));