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

* [bug#52670] adjust instance histroy.

Browse Source
This commit is contained in:
caoyanyi
2025-04-23 15:08:42 +08:00
committed by 刘刚
parent bcdb5bb486
commit cc68ff9675
5 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/de.php
+2 -8
View File
@@ -47,6 +47,7 @@ $lang->action->comment = 'Kommentar';
$lang->action->actioncomment = 'Kommentar';
$lang->action->lastComment = 'Kommentar';
$lang->action->byQuery = 'Search';
$lang->action->noLimit = 'No Limit';
$lang->action->trashAction = 'Recycle List';
$lang->action->undeleteAction = 'Reset Data';
@@ -347,14 +348,7 @@ $lang->action->desc->adjustmemory = '$date, resized to <strong>$newValue<
$lang->action->desc->adjustcpu = '$date, resized to <strong>$newValue</strong> CPU by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvol = '$date, resized to <strong>$newValue</strong> GB disk space by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustmemorychange = '$date, modify the memory from <strong>$oldValue</strong> to <strong>$newValue</strong> by <strong>$actor</strong>.' . "\n";
if(empty($oldValue))
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>unlimit</strong> to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
else
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvolchange = '$date, modify this disk space from <strong>oldValue</strong>GB to <strong>newValue</strong>GB。' . "\n";
$lang->action->desc->enableldap = '$date, enabled by <strong>$actor</strong> of LDAP。' . "\n";
$lang->action->desc->disableldap = '$date, disabled by <strong>$actor</strong> of LDAP。' . "\n";
module/action/lang/en.php
+2 -8
View File
@@ -47,6 +47,7 @@ $lang->action->comment = 'Comment';
$lang->action->actioncomment = 'Comment';
$lang->action->lastComment = 'Comment';
$lang->action->byQuery = 'Search';
$lang->action->noLimit = 'No Limit';
$lang->action->trashAction = 'Recycle List';
$lang->action->undeleteAction = 'Reset Data';
@@ -347,14 +348,7 @@ $lang->action->desc->adjustmemory = '$date, resized to <strong>$newVa
$lang->action->desc->adjustcpu = '$date, resized to <strong>$newValue</strong> CPU by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvol = '$date, resized to <strong>$newValue</strong> GB disk space by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustmemorychange = '$date, modify the memory from <strong>$oldValue</strong> to <strong>$newValue</strong> by <strong>$actor</strong>.' . "\n";
if(empty($oldValue))
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>unlimit</strong> to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
else
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvolchange = '$date, modify this disk space from <strong>oldValue</strong>GB to <strong>newValue</strong>GB。' . "\n";
$lang->action->desc->enableldap = '$date, enabled by <strong>$actor</strong> of LDAP。' . "\n";
$lang->action->desc->disableldap = '$date, disabled by <strong>$actor</strong> of LDAP。' . "\n";
module/action/lang/fr.php
+2 -8
View File
@@ -47,6 +47,7 @@ $lang->action->comment = 'Commentaire';
$lang->action->actioncomment = 'Commentaire';
$lang->action->lastComment = 'Commentaire';
$lang->action->byQuery = 'Search';
$lang->action->noLimit = 'No Limit';
$lang->action->trashAction = 'Recycle List';
$lang->action->undeleteAction = 'Reset Data';
@@ -347,14 +348,7 @@ $lang->action->desc->adjustmemory = '$date, resized to <strong>$newVa
$lang->action->desc->adjustcpu = '$date, resized to <strong>$newValue</strong> CPU by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvol = '$date, resized to <strong>$newValue</strong> GB disk space by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustmemorychange = '$date, modify the memory from <strong>$oldValue</strong> to <strong>$newValue</strong> by <strong>$actor</strong>.' . "\n";
if(empty($oldValue))
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>unlimit</strong> to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
else
{
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
}
$lang->action->desc->adjustcpuchange = '$date, modify CPU from <strong>$oldValue</strong>-core to <strong>$newValue</strong>-core by <strong>$actor</strong>.' . "\n";
$lang->action->desc->adjustvolchange = '$date, modify this disk space from <strong>oldValue</strong>GB to <strong>newValue</strong>GB。' . "\n";
$lang->action->desc->enableldap = '$date, enabled by <strong>$actor</strong> of LDAP。' . "\n";
$lang->action->desc->disableldap = '$date, disabled by <strong>$actor</strong> of LDAP。' . "\n";
module/action/lang/zh-cn.php
+2 -8
View File
@@ -47,6 +47,7 @@ $lang->action->comment = '备注';
$lang->action->actioncomment = '备注';
$lang->action->lastComment = '备注';
$lang->action->byQuery = '搜索';
$lang->action->noLimit = '不限制';
$lang->action->trashAction = '回收站列表';
$lang->action->undeleteAction = '还原数据';
@@ -347,14 +348,7 @@ $lang->action->desc->adjustmemory = '$date, 由 <strong>$actor</stron
$lang->action->desc->adjustcpu = '$date, 由 <strong>$actor</strong> 调整CPU到 <strong>$newValue</strong> 核。' . "\n";
$lang->action->desc->adjustvol = '$date, 由 <strong>$actor</strong> 调整磁盘空间到 <strong>$newValue</strong> GB。' . "\n";
$lang->action->desc->adjustmemorychange = '$date, 由 <strong>$actor</strong> 修改内存，从 <strong>$oldValue</strong> 修改为 <strong>$newValue</strong>。' . "\n";
if(empty($oldValue))
{
$lang->action->desc->adjustcpuchange = '$date, 由 <strong>$actor</strong> 修改CPU，从 <strong>不限制</strong> 修改为 <strong>$newValue</strong>核。' . "\n";
}
else
{
$lang->action->desc->adjustcpuchange = '$date, 由 <strong>$actor</strong> 修改CPU，从 <strong>$oldValue</strong>核 修改为 <strong>$newValue</strong>核。' . "\n";
}
$lang->action->desc->adjustcpuchange = '$date, 由 <strong>$actor</strong> 修改CPU，从 <strong>$oldValue</strong>核 修改为 <strong>$newValue</strong>核。' . "\n";
$lang->action->desc->adjustvolchange = '$date, 由 <strong>$actor</strong> 修改磁盘空间，从 <strong>$oldValue</strong>GB 修改为 <strong>$newValue</strong>GB。' . "\n";
$lang->action->desc->enableldap = '$date, 由 <strong>$actor</strong> 启用了LDAP。' . "\n";
$lang->action->desc->disableldap = '$date, 由 <strong>$actor</strong> 禁用了LDAP。' . "\n";
module/action/model.php
+7
View File
@@ -240,6 +240,13 @@ class actionModel extends model
{
$history->diff = str_replace(array("class='iframe'", '+'), array("data-size='{\"width\": 800, \"height\": 500}' data-toggle='modal'", '%2B'), $history->diff);
}
if(in_array($history->field, array('adjustmemory', 'adjustcpu', 'adjustvol', 'adjustmemorychange', 'adjustcpuchange', 'adjustvolchange')))
{
if(empty($history->newValue) && empty($history->new)) $history->newValue = $this->lang->action->noLimit;
if(empty($history->oldValue) && empty($history->old)) $history->oldValue = $this->lang->action->noLimit;
}
$history->new = !empty($history->newValue) ? $history->newValue : $history->new;
$history->old = !empty($history->oldValue) ? $history->oldValue : $history->old;
$history = $this->file->replaceImgURL($history, 'old,new');