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

* Fix bug #46942.

Browse Source
This commit is contained in:
tianshujie
2024-03-13 15:44:08 +08:00
parent 72acf8b32c
commit 6d83d7ea9e
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -4
View File
@@ -1271,10 +1271,7 @@ class execution extends control
list($pmUsers, $poUsers, $qdUsers, $rdUsers) = $this->executionZen->setUserMoreLink($executions);
/* Set custom fields. */
foreach(explode(',', $this->config->execution->list->customBatchEditFields) as $field)
{
$customFields[$field] = $field == 'lifetime' ? $this->lang->execution->type : str_replace($this->lang->executionCommon, $this->lang->execution->common, $this->lang->execution->$field);
}
foreach(explode(',', $this->config->execution->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->execution->$field;
$parentIdList = array();
foreach($executions as $execution)
module/execution/ui/batchedit.html.php
+5 -7
View File
@@ -56,7 +56,7 @@ formBatchPanel
formBatchItem
(
set::name('name'),
set::label($lang->execution->name),
set::label($app->tab == 'execution' ? $lang->execution->execName : $lang->execution->name),
set::width('240px'),
set::required(true)
),
@@ -72,14 +72,14 @@ formBatchPanel
$setCode ? formBatchItem
(
set::name('code'),
set::label($lang->execution->code),
set::label($app->tab == 'execution' ? $lang->execution->execCode : $lang->execution->code),
set::width('136px'),
set::required(strpos(",{$config->execution->edit->requiredFields},", ',code,') !== false)
) : null,
formBatchItem
(
set::name('PM'),
set::label($lang->execution->PM),
set::label($app->tab == 'execution' ? $lang->execution->execPM : $lang->execution->PM),
set::control('picker'),
set::ditto(true),
set::defaultDitto('off'),
@@ -123,9 +123,7 @@ formBatchPanel
formBatchItem
(
set::name('lifetime'),
set::label(
$lang->execution->type
),
set::label($app->tab == 'execution' ? $lang->execution->execType : $lang->execution->type),
set::control('picker'),
set::items($lang->execution->lifeTimeList),
set::width('120px'),
@@ -171,7 +169,7 @@ formBatchPanel
formBatchItem
(
set::name('desc'),
set::label($lang->execution->desc),
set::label($app->tab == 'execution' ? $lang->execution->execDesc : $lang->execution->desc),
set::control('textarea'),
set::width('160px'),
set::hidden(strpos("{$showFields}", 'desc') === false)