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

* Fix bug #37290.

Browse Source
This commit is contained in:
zhaoke
2023-08-17 14:37:51 +08:00
parent 1ba047346c
commit 5f4ca6ee2f
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitea.class.php
+8 -1
View File
@@ -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;
module/instance/ui/view.html.php
+2 -2
View File
@@ -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
(
module/system/config/dtable.php
+2 -2
View File
@@ -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' => '<i class="icon icon-cpu mr-1"></i>' . $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' => '<i class="icon icon-memory mr-1"></i>' . $lang->instance->mem);
$config->system->dtable->instanceList->fieldList['mem']['name'] = 'mem';
$config->system->dtable->instanceList->fieldList['mem']['minWidth'] = '230';