From af76befb02946921193a0a773e1d5ec59e7ace31 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 15:15:34 +0800 Subject: [PATCH] * Resolve issue #756. --- module/custom/view/code.html.php | 2 +- module/execution/config.php | 4 ++-- module/execution/model.php | 4 ++-- module/execution/view/batchedit.html.php | 4 ++-- module/execution/view/create.html.php | 2 +- module/execution/view/edit.html.php | 2 +- module/execution/view/view.html.php | 2 +- module/product/config.php | 4 ++-- module/product/view/create.html.php | 2 +- module/product/view/edit.html.php | 2 +- module/product/view/view.html.php | 2 +- module/programplan/model.php | 4 ++-- module/programplan/view/create.html.php | 10 +++++----- module/programplan/view/edit.html.php | 2 +- module/project/config.php | 2 +- module/project/control.php | 2 +- module/project/model.php | 4 ++-- module/project/view/batchedit.html.php | 4 ++-- module/project/view/create.html.php | 2 +- module/project/view/edit.html.php | 2 +- module/project/view/view.html.php | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/module/custom/view/code.html.php b/module/custom/view/code.html.php index 65a80730d4..643aeb940b 100644 --- a/module/custom/view/code.html.php +++ b/module/custom/view/code.html.php @@ -16,7 +16,7 @@ custom->setCode;?> - setCode) ? $config->setCode : 1;?> + setCode) ? $config->setCode : 0;?> custom->conceptOptions->URAndSR as $key => $value):?> diff --git a/module/execution/config.php b/module/execution/config.php index 216136c250..89311d721e 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -176,7 +176,7 @@ $config->execution->gantt->linkType['end']['end'] = 2; $config->execution->gantt->linkType['begin']['end'] = 3; $config->execution->datatable = new stdclass(); -if(!isset($config->setCode) or $config->setCode == 1) +if(isset($config->setCode) and $config->setCode == 1) { $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'openedDate', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); } @@ -201,7 +201,7 @@ $config->execution->datatable->fieldList['name']['nestedToggle'] = true; $config->execution->datatable->fieldList['name']['iconRender'] = true; $config->execution->datatable->fieldList['name']['required'] = 'yes'; -if(!isset($config->setCode) or $config->setCode == 1) +if(isset($config->setCode) and $config->setCode == 1) { $config->execution->datatable->fieldList['code']['title'] = 'execCode'; $config->execution->datatable->fieldList['code']['width'] = '180'; diff --git a/module/execution/model.php b/module/execution/model.php index 76f9b07418..f7e28ab9b7 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -533,7 +533,7 @@ class executionModel extends model $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch(); /* Judgment of required items. */ - if($oldExecution->type != 'stage' and $this->post->code == '' and (!isset($this->config->setCode) or $this->config->setCode == 1)) + if($oldExecution->type != 'stage' and $this->post->code == '' and (isset($this->config->setCode) and $this->config->setCode == 1)) { dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code); return false; @@ -5789,7 +5789,7 @@ class executionModel extends model $_POST['status'] = $project->status; $_POST['acl'] = 'open'; - if(!isset($this->config->setCode) or $this->config->setCode == 1) $_POST['code'] = $project->code; + if(isset($this->config->setCode) and $this->config->setCode == 1) $_POST['code'] = $project->code; $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll(); foreach($projectProducts as $projectProduct) diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index d78ab1d11f..7f75310b9d 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -55,7 +55,7 @@ execution->method;?> execution->$name;?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> execution->$code;?> '>execution->$PM;?> @@ -94,7 +94,7 @@ execution->typeList, $executions[$executionID]->type);?> name, "class='form-control' id='names{$executionID}'");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> code, "id='codes{$executionID}' class='form-control'");?> ' style='overflow:visible'>PM, "class='form-control picker-select'");?> diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index f8e6f80772..7f3cc53419 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -77,7 +77,7 @@ - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> execution->execCode : $lang->execution->code;?> diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index d5d43fe019..3eb89bfe7e 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -50,7 +50,7 @@ execution->name;?> name, "class='form-control' required");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> execution->code;?> code, "class='form-control' required");?> diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 8c059a24d5..1e1232132c 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -269,7 +269,7 @@
- setCode) and $config->setCode == 0) ? 'hidden' : '';?> + setCode) or $config->setCode == 0) ? 'hidden' : '';?>

id;?> code;?> name;?>

diff --git a/module/product/config.php b/module/product/config.php index 2982a63191..93a32df9cf 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -96,7 +96,7 @@ $app->loadLang('product'); $config->product->all = new stdclass(); $config->product->all->search['module'] = 'product'; $config->product->all->search['fields']['name'] = $lang->product->name; -if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code; +if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code; $config->product->all->search['fields']['id'] = $lang->product->id; if($config->systemMode == 'ALM') { @@ -113,7 +113,7 @@ $config->product->all->search['fields']['createdDate'] = $lang->product->created $config->product->all->search['fields']['createdBy'] = $lang->product->createdBy; $config->product->all->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->product->all->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => ''); if($config->systemMode == 'ALM') { diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index c8dfe3c96c..5e67b93b56 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -56,7 +56,7 @@ product->name;?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> product->code;?> diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 785a0c3873..69ae505779 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -47,7 +47,7 @@ product->name;?> name, "class='form-control' required");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> product->code;?> code, "class='form-control' required");?> diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index ba870e1d4b..4f7edfedd0 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -19,7 +19,7 @@
- setCode) and $config->setCode == 0) ? 'hidden' : '';?> + setCode) or $config->setCode == 0) ? 'hidden' : '';?>

id;?> code;?> name;?>

desc;?>

diff --git a/module/programplan/model.php b/module/programplan/model.php index 3afbc2b94d..42c004d51b 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -714,7 +714,7 @@ class programplanModel extends model $sameNames = array_diff_assoc($names, array_unique($names)); $project = $this->loadModel('project')->getByID($projectID); - $setCode = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false; + $setCode = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false; $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : ''); $datas = array(); @@ -1075,7 +1075,7 @@ class programplanModel extends model if($projectID) $this->loadModel('execution')->checkBeginAndEndDate($projectID, $plan->begin, $plan->end); if(dao::isError()) return false; - $setCode = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false; + $setCode = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false; if($setCode and empty($plan->code)) { dao::$errors['code'][] = sprintf($this->lang->error->notempty, $this->lang->execution->code); diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 58082983e3..eaea0d735b 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -78,7 +78,7 @@ execution->method;?> nameAB;?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> execution->code : $lang->code;?> '>programplan->PM : $lang->programplan->PMAB;?> @@ -108,7 +108,7 @@ - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> code) ? $stage->code : '', "class='form-control'");?> > @@ -144,7 +144,7 @@ execution->typeList, $plan->type);?>'>execution->typeList, $plan->type);?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> code, "class='form-control'");?> >PM, "class='form-control picker-select'");?> @@ -180,7 +180,7 @@ execution->typeList, '', "class='form-control chosen'");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> > @@ -227,7 +227,7 @@ execution->typeList, '', "class='form-control chosen'");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> > diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index 634d17b3d4..73ae92b6c7 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -36,7 +36,7 @@ programplan->name;?> name, "class='form-control'");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> execution->code;?> code, "class='form-control'");?> diff --git a/module/project/config.php b/module/project/config.php index 6e526e769b..bb8ff5e92d 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -136,7 +136,7 @@ $config->project->datatable->fieldList['actions']['width'] = '165'; $config->project->datatable->fieldList['actions']['required'] = 'yes'; $config->project->datatable->fieldList['actions']['pri'] = '1'; -if(isset($config->setCode) and $config->setCode == 0) unset($config->project->datatable->fieldList['code']); +if(!isset($config->setCode) or $config->setCode == 0) unset($config->project->datatable->fieldList['code']); $config->project->checkList = new stdclass(); $config->project->checkList->scrum = array('bug', 'execution', 'build', 'doc', 'release', 'testtask', 'case'); diff --git a/module/project/control.php b/module/project/control.php index c6d9d53c0a..ba8e5bf44e 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -68,7 +68,7 @@ class project extends control $fields[$fieldName] = zget($projectLang, $fieldName); unset($fields[$key]); } - if(isset($this->config->setCode) and empty($this->config->setCode)) unset($fields['code']); + if(!isset($this->config->setCode) or empty($this->config->setCode)) unset($fields['code']); if(isset($fields['hasProduct'])) $fields['hasProduct'] = $projectLang->type; diff --git a/module/project/model.php b/module/project/model.php index cd23ccc3d0..78a943fbe9 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1023,7 +1023,7 @@ class projectModel extends model $programPairs += $this->loadModel('program')->getPairs(); $this->config->project->search['params']['parent']['values'] = $programPairs; - if(isset($this->config->setCode) and $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']); + if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']); if($this->config->systemMode == 'light') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']); $this->loadModel('search')->setSearchParams($this->config->project->search); @@ -1250,7 +1250,7 @@ class projectModel extends model ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags) ->remove('products,branch,plans,delta,newProduct,productName,future,contactListMenu,teamMembers') ->get(); - if(isset($this->config->setCode) and $this->config->setCode == 0) unset($project->code); + if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($project->code); /* Lean mode relation defaultProgram. */ if($this->config->systemMode == 'light') $project->parent = $this->config->global->defaultProgram; diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 0c32848914..796850275a 100644 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -34,7 +34,7 @@ project->parent;?> project->name;?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> project->code;?> project->PM;?> @@ -63,7 +63,7 @@ name, "class='form-control'");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> code, "class='form-control'");?> PM, "class='form-control chosen'");?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 5fa5aff2a4..86aaf07843 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -73,7 +73,7 @@ - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> project->code;?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index a0d792571d..a97248f3e5 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -75,7 +75,7 @@ name, "class='form-control' required");?> - setCode) or $config->setCode == 1):?> + setCode) and $config->setCode == 1):?> project->code;?> code, "class='form-control' required");?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index f10d9f4121..2a2cf76587 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -114,7 +114,7 @@
- setCode) and $config->setCode == 0) ? 'hidden' : '';?> + setCode) or $config->setCode == 0) ? 'hidden' : '';?>

id;?> code;?> name;?>