From 675d2c2e86d04a51234ffe7f14d55ba887e488d6 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 11 May 2022 08:49:22 +0000 Subject: [PATCH 1/2] * Fix bug #22339. --- module/execution/js/edit.js | 2 +- "module/execution/view/\\" | 142 ++++++++++++++++++++++++++++ module/execution/view/edit.html.php | 2 +- 3 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 "module/execution/view/\\" diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js index 0c09b6bfe8..3955629251 100644 --- a/module/execution/js/edit.js +++ b/module/execution/js/edit.js @@ -71,6 +71,6 @@ $(function() { $('#submit').after(""); } - $("#syncStories").val(confirm(confirmSyncStories) ? 'yes' : 'no'); + $("#syncStories").val(confirm(confirmSync) ? 'yes' : 'no'); }); }) diff --git "a/module/execution/view/\\" "b/module/execution/view/\\" new file mode 100644 index 0000000000..aa7fc31b38 --- /dev/null +++ "b/module/execution/view/\\" @@ -0,0 +1,142 @@ + + * @package ZenTaoPMS + * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ + */ +?> + + +
+
+

execution->batchEdit;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=execution§ion=custom&key=batchEditFields')?> + +
+
+ execution->edit->requiredFields) as $field) + { + if($field) + { + $requiredFields[$field] = ''; + if(strpos(",{$config->execution->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; + } + } + $minWidth = (count($visibleFields) > 5) ? 'w-150px' : ''; + + $name = $from == 'execution' ? 'execName' : 'name'; + $code = $from == 'execution' ? 'execCode' : 'code'; + $PM = $from == 'execution' ? 'execPM' : 'PM'; + $type = $from == 'execution' ? 'execType' : 'type'; + $desc = $from == 'execution' ? 'execDesc' : 'desc'; + $status = $from == 'execution' ? 'execStatus' : 'status'; + + ?> +
'> +
+ + + + + systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> + + + + + + + + + + + + + + + + execution->getFlowExtendFields(); + foreach($extendFields as $extendField) echo ""; + ?> + + + + + config->moreLinks["PM"])) $this->config->moreLinks["PMs[$executionID]"] = $this->config->moreLinks["PM"]; + if(!empty($this->config->moreLinks["PO"])) $this->config->moreLinks["POs[$executionID]"] = $this->config->moreLinks["PO"]; + if(!empty($this->config->moreLinks["QD"])) $this->config->moreLinks["QDs[$executionID]"] = $this->config->moreLinks["QD"]; + if(!empty($this->config->moreLinks["RD"])) $this->config->moreLinks["RDs[$executionID]"] = $this->config->moreLinks["RD"]; + ?> + + + systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> + + + + + + + + + + + + + + + + control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $executions[$executionID], $extendField->field . "[{$executionID}]") . "";?> + + config->moreLinks["PMs[$executionID]"])) unset($this->config->moreLinks["PMs[$executionID]"]); + if(isset($this->config->moreLinks["POs[$executionID]"])) unset($this->config->moreLinks["POs[$executionID]"]); + if(isset($this->config->moreLinks["QDs[$executionID]"])) unset($this->config->moreLinks["QDs[$executionID]"]); + if(isset($this->config->moreLinks["RDs[$executionID]"])) unset($this->config->moreLinks["RDs[$executionID]"]); + ?> + + + + + + + +
idAB;?>execution->projectName;?>execution->$name;?>execution->$code;?>'>execution->$PM;?>'>execution->PO;?>'>execution->QD;?>'>execution->RD;?>'>execution->$type;?>'>execution->$status;?>execution->begin;?>execution->end;?>'>execution->$desc;?>'>execution->teamname;?>'>execution->days;?>{$extendField->name}
project, "class='form-control picker-select' onchange='sync($executionID, {$executions[$executionID]->project})'");?>name, "class='form-control'");?>code, "class='form-control'");?>' style='overflow:visible'>PM, "class='form-control picker-select'");?>' style='overflow:visible'>PO, "class='form-control picker-select'");?>' style='overflow:visible'>QD, "class='form-control picker-select'");?>' style='overflow:visible'>RD, "class='form-control picker-select'");?>'> + type == 'stage') + { + echo html::select("attributes[$executionID]", $lang->stage->typeList, $executions[$executionID]->attribute, 'class=form-control'); + } + else + { + echo html::select("lifetimes[$executionID]", $lang->execution->lifeTimeList, $executions[$executionID]->lifetime, 'class=form-control'); + } + ?> + '>execution->statusList, $executions[$executionID]->status, 'class=form-control');?>begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>'> desc, "rows='1' class='form-control autosize'");?>'>team, "class='form-control'");?>'> +
+ days, "class='form-control'");?> + execution->day;?> +
+
+ + goback, $this->session->executionList, 'self', '', 'btn btn-wide');;?> +
+
+
+
+execution->weekend);?> +execution->confirmSync);?> +project);?> + diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 7c664b9c0a..449d728f84 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -220,6 +220,6 @@ execution->notAllowRemoveProducts);?> -execution->confirmSyncStories);?> +execution->confirmSync);?> systemMode);?> From a0f2b068dc9287e98516d43da674ed5a26c53cec Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 11 May 2022 08:51:36 +0000 Subject: [PATCH 2/2] * Fix bug #22339. --- "module/execution/view/\\" | 142 ------------------------------------- 1 file changed, 142 deletions(-) delete mode 100644 "module/execution/view/\\" diff --git "a/module/execution/view/\\" "b/module/execution/view/\\" deleted file mode 100644 index aa7fc31b38..0000000000 --- "a/module/execution/view/\\" +++ /dev/null @@ -1,142 +0,0 @@ - - * @package ZenTaoPMS - * @version $Id: index.html.php 4129 2013-01-18 01:58:14Z wwccss $ - */ -?> - - -
-
-

execution->batchEdit;?>

-
- createLink('custom', 'ajaxSaveCustomFields', 'module=execution§ion=custom&key=batchEditFields')?> - -
-
- execution->edit->requiredFields) as $field) - { - if($field) - { - $requiredFields[$field] = ''; - if(strpos(",{$config->execution->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; - } - } - $minWidth = (count($visibleFields) > 5) ? 'w-150px' : ''; - - $name = $from == 'execution' ? 'execName' : 'name'; - $code = $from == 'execution' ? 'execCode' : 'code'; - $PM = $from == 'execution' ? 'execPM' : 'PM'; - $type = $from == 'execution' ? 'execType' : 'type'; - $desc = $from == 'execution' ? 'execDesc' : 'desc'; - $status = $from == 'execution' ? 'execStatus' : 'status'; - - ?> -
'> -
- - - - - systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> - - - - - - - - - - - - - - - - execution->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; - ?> - - - - - config->moreLinks["PM"])) $this->config->moreLinks["PMs[$executionID]"] = $this->config->moreLinks["PM"]; - if(!empty($this->config->moreLinks["PO"])) $this->config->moreLinks["POs[$executionID]"] = $this->config->moreLinks["PO"]; - if(!empty($this->config->moreLinks["QD"])) $this->config->moreLinks["QDs[$executionID]"] = $this->config->moreLinks["QD"]; - if(!empty($this->config->moreLinks["RD"])) $this->config->moreLinks["RDs[$executionID]"] = $this->config->moreLinks["RD"]; - ?> - - - systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> - - - - - - - - - - - - - - - - control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $executions[$executionID], $extendField->field . "[{$executionID}]") . "";?> - - config->moreLinks["PMs[$executionID]"])) unset($this->config->moreLinks["PMs[$executionID]"]); - if(isset($this->config->moreLinks["POs[$executionID]"])) unset($this->config->moreLinks["POs[$executionID]"]); - if(isset($this->config->moreLinks["QDs[$executionID]"])) unset($this->config->moreLinks["QDs[$executionID]"]); - if(isset($this->config->moreLinks["RDs[$executionID]"])) unset($this->config->moreLinks["RDs[$executionID]"]); - ?> - - - - - - - -
idAB;?>execution->projectName;?>execution->$name;?>execution->$code;?>'>execution->$PM;?>'>execution->PO;?>'>execution->QD;?>'>execution->RD;?>'>execution->$type;?>'>execution->$status;?>execution->begin;?>execution->end;?>'>execution->$desc;?>'>execution->teamname;?>'>execution->days;?>{$extendField->name}
project, "class='form-control picker-select' onchange='sync($executionID, {$executions[$executionID]->project})'");?>name, "class='form-control'");?>code, "class='form-control'");?>' style='overflow:visible'>PM, "class='form-control picker-select'");?>' style='overflow:visible'>PO, "class='form-control picker-select'");?>' style='overflow:visible'>QD, "class='form-control picker-select'");?>' style='overflow:visible'>RD, "class='form-control picker-select'");?>'> - type == 'stage') - { - echo html::select("attributes[$executionID]", $lang->stage->typeList, $executions[$executionID]->attribute, 'class=form-control'); - } - else - { - echo html::select("lifetimes[$executionID]", $lang->execution->lifeTimeList, $executions[$executionID]->lifetime, 'class=form-control'); - } - ?> - '>execution->statusList, $executions[$executionID]->status, 'class=form-control');?>begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>'> desc, "rows='1' class='form-control autosize'");?>'>team, "class='form-control'");?>'> -
- days, "class='form-control'");?> - execution->day;?> -
-
- - goback, $this->session->executionList, 'self', '', 'btn btn-wide');;?> -
-
-
-
-execution->weekend);?> -execution->confirmSync);?> -project);?> -