diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php index b2c75a140a..e95db090da 100644 --- a/module/design/config/dtable.php +++ b/module/design/config/dtable.php @@ -42,17 +42,11 @@ $config->design->dtable->fieldList['actions']['list'] = $config->design->actionL $app->loadLang('repo'); -$config->design->linkcommit->dtable->fieldList['id']['title'] = ''; -$config->design->linkcommit->dtable->fieldList['id']['name'] = ''; -$config->design->linkcommit->dtable->fieldList['id']['checkbox'] = true; -$config->design->linkcommit->dtable->fieldList['id']['type'] = 'checkID'; -$config->design->linkcommit->dtable->fieldList['id']['sortType'] = false; -$config->design->linkcommit->dtable->fieldList['id']['width'] = 30; - $config->design->linkcommit->dtable->fieldList['revision']['title'] = $lang->repo->revisionA; $config->design->linkcommit->dtable->fieldList['revision']['type'] = 'title'; $config->design->linkcommit->dtable->fieldList['revision']['link'] = helper::createLink('repo', 'revision', 'repoID=%s&objectID=%s&revision={revision}'); $config->design->linkcommit->dtable->fieldList['revision']['sortType'] = false; +$config->design->linkcommit->dtable->fieldList['revision']['checkbox'] = true; $config->design->linkcommit->dtable->fieldList['commit']['title'] = $lang->repo->commit; $config->design->linkcommit->dtable->fieldList['commit']['type'] = 'category'; diff --git a/module/design/model.php b/module/design/model.php index 16cfc5346b..5bfb20c422 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -171,10 +171,10 @@ class designModel extends model if(in_array($commit->revision, $revisions)) { $log = new stdclass(); - $log->committer = $commit->committer_name; - $log->revision = $commit->id; - $log->comment = $commit->message; - $log->time = date('Y-m-d H:i:s', strtotime($commit->created_at)); + $log->committer = $commit->committer; + $log->revision = $commit->revision; + $log->comment = $commit->comment; + $log->time = date('Y-m-d H:i:s', strtotime($commit->time)); $logs[] = $log; } diff --git a/module/design/ui/linkcommit.html.php b/module/design/ui/linkcommit.html.php index f1d61b94b1..3b48a62dbf 100644 --- a/module/design/ui/linkcommit.html.php +++ b/module/design/ui/linkcommit.html.php @@ -92,6 +92,7 @@ else set::data($revisions), set::footToolbar($footToolbar), set::checkInfo(jsRaw('function(checkedIDList){return \'\';}')), + set::rowKey('revision'), set::footPager( usePager (