diff --git a/lib/scm/gitea.class.php b/lib/scm/gitea.class.php index 10cbcdc360..18b65e6d18 100644 --- a/lib/scm/gitea.class.php +++ b/lib/scm/gitea.class.php @@ -322,7 +322,14 @@ class Gitea if(strpos($fromRevision, '^') !== false) { $list = execCmd(escapeCmd("$this->client log -2 $toRevision --pretty=format:%H -- $path"), 'array'); - if(isset($list[1])) $fromRevision = $list[1]; + if(isset($list[1])) + { + $fromRevision = $list[1]; + } + else + { + $fromRevision = 'HEAD^'; + } } $lines = execCmd(escapeCmd("$this->client diff $fromRevision $toRevision -- $path"), 'array'); return $lines; diff --git a/module/instance/ui/view.html.php b/module/instance/ui/view.html.php index dc361837b3..35cb631f0e 100644 --- a/module/instance/ui/view.html.php +++ b/module/instance/ui/view.html.php @@ -86,7 +86,7 @@ div ( setClass('flex progress-container'), set::title($cpuInfo['tip']), - icon('cog-outline text-' . $cpuInfo['color']), + icon('cpu text-' . $cpuInfo['color']), $lang->instance->cpuUsage, div ( @@ -99,7 +99,7 @@ div setStyle('width', $cpuInfo['rate']) ) ), - icon('desktop text-' . $memoryInfo['color']), + icon('memory text-' . $memoryInfo['color']), $lang->instance->memUsage, span ( diff --git a/module/system/config/dtable.php b/module/system/config/dtable.php index fa43750d34..c1858578e7 100644 --- a/module/system/config/dtable.php +++ b/module/system/config/dtable.php @@ -68,10 +68,10 @@ $config->system->dtable->instanceList->fieldList['status']['title'] = $lang->sys $config->system->dtable->instanceList->fieldList['status']['name'] = 'status'; $config->system->dtable->instanceList->fieldList['status']['map'] = $lang->instance->statusList; -$config->system->dtable->instanceList->fieldList['cpu']['title'] = $lang->instance->cpu; +$config->system->dtable->instanceList->fieldList['cpu']['title'] = array('html' => '' . $lang->instance->cpu); $config->system->dtable->instanceList->fieldList['cpu']['name'] = 'cpu'; $config->system->dtable->instanceList->fieldList['cpu']['minWidth'] = '160'; -$config->system->dtable->instanceList->fieldList['mem']['title'] = $lang->instance->mem; +$config->system->dtable->instanceList->fieldList['mem']['title'] = array('html' => '' . $lang->instance->mem); $config->system->dtable->instanceList->fieldList['mem']['name'] = 'mem'; $config->system->dtable->instanceList->fieldList['mem']['minWidth'] = '230';