From f6ec62adba6519f0eef5f95da71a2bfeb25cb2af Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Fri, 30 Oct 2020 14:55:36 +0800 Subject: [PATCH] * Fix bug. --- module/doc/control.php | 8 ++++---- module/product/view/edit.html.php | 4 ++-- module/program/config.php | 8 +------- module/program/control.php | 7 +++---- module/program/model.php | 7 +++---- module/program/view/pgmcreate.html.php | 6 +++--- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 0e5e35671c..db2bd807dd 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -108,7 +108,7 @@ class doc extends control /* According the from, set menus. */ if($from == 'product') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'product'; $this->lang->doc->menu = $this->lang->product->menu; $this->lang->doc->menuOrder = $this->lang->product->menuOrder; $this->product->setMenu($this->product->getPairs(), $lib->product); @@ -116,7 +116,7 @@ class doc extends control } elseif($from == 'project') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'project'; $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; $this->project->setMenu($this->project->getPairs('nocode', $this->session->PRJ), $lib->project); @@ -853,7 +853,7 @@ class doc extends control if(empty($object)) $this->locate($this->createLink($type, 'create')); if($from == 'product') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'product'; $this->lang->doc->menu = $this->lang->product->menu; $this->lang->doc->menuOrder = $this->lang->product->menuOrder; $this->product->setMenu($this->product->getPairs(), $objectID); @@ -861,7 +861,7 @@ class doc extends control } elseif($from == 'project') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'project'; $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; $this->project->setMenu($this->project->getPairs('nocode', $this->session->PRJ), $objectID); diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index e9faf3d97c..b60bb3a8d8 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -27,8 +27,8 @@ product->program;?> - program, "class='form-control chosen' required");?> - + program, '/');?> + product->name;?> name, "class='form-control' required");?> diff --git a/module/program/config.php b/module/program/config.php index 68a39e9d6b..4adbb3896d 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -33,7 +33,6 @@ $config->program->PRJEdit->requiredFields = 'name,code,begin,end'; $config->program->sortFields = new stdclass(); $config->program->sortFields->idAB = 'id'; -$config->program->sortFields->PRJCode = 'code'; $config->program->sortFields->PRJModel = 'model'; $config->program->sortFields->begin = 'begin'; $config->program->sortFields->end = 'end'; @@ -42,18 +41,13 @@ $config->program->sortFields->PRJBudget = 'budget'; global $lang; $config->program->datatable = new stdclass(); -$config->program->datatable->defaultField = array('idAB', 'PRJCode', 'PRJName', 'PRJModel', 'PRJPM', 'begin', 'end', 'PRJStatus', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); +$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJModel', 'PRJPM', 'begin', 'end', 'PRJStatus', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); $config->program->datatable->fieldList['idAB']['title'] = 'idAB'; $config->program->datatable->fieldList['idAB']['fixed'] = 'left'; $config->program->datatable->fieldList['idAB']['width'] = '60'; $config->program->datatable->fieldList['idAB']['required'] = 'yes'; -$config->program->datatable->fieldList['PRJCode']['title'] = 'PRJCode'; -$config->program->datatable->fieldList['PRJCode']['fixed'] = 'left'; -$config->program->datatable->fieldList['PRJCode']['width'] = '80'; -$config->program->datatable->fieldList['PRJCode']['required'] = 'yes'; - $config->program->datatable->fieldList['PRJName']['title'] = 'PRJName'; $config->program->datatable->fieldList['PRJName']['fixed'] = 'left'; $config->program->datatable->fieldList['PRJName']['width'] = 'auto'; diff --git a/module/program/control.php b/module/program/control.php index a60b0e5351..4c44ab36da 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -133,7 +133,7 @@ class program extends control /** * Create a project. * - * @param string $parentProgramID + * @param int $parentProgramID * @access public * @return void */ @@ -157,7 +157,7 @@ class program extends control $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); $this->view->users = $this->user->getPairs('noclosed|nodeleted'); - $this->view->parentProgram = $parentProgramID ? $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($parentProgramID)->fetch() : ''; + $this->view->parentProgram = $parentProgramID ? $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($parentProgramID)->fetch() : 0; $this->view->parents = $this->program->getParentPairs(); $this->display(); @@ -187,8 +187,7 @@ class program extends control $this->action->logHistory($actionID, $changes); } - $url = $this->session->PRJList ? $this->session->PRJList : inlink('pgmbrowse'); - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $url)); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inLink('PGMBrowse'))); } $parents = $this->program->getParentPairs(); diff --git a/module/program/model.php b/module/program/model.php index 41ecc4dc7d..f2158ce6d0 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1370,11 +1370,10 @@ class programModel extends model case 'idAB': printf('%03d', $project->id); break; - case 'PRJCode': - echo $project->code; - break; case 'PRJName': - echo html::a(helper::createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name); + $projectLink = helper::createLink('program', 'index', "projectID=$project->id", '', '', $project->id); + $projectCode = " $project->code"; + echo html::a($projectLink, $project->name . $projectCode); break; case 'PRJModel': echo zget($this->lang->program->modelList, $project->model); diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 61c233b5c5..6b3a1cf38f 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -1,12 +1,12 @@ * @package project - * @version $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ + * @version $Id: pgmcreate.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ ?> @@ -43,7 +43,7 @@ -
program->PGMParent;?>id) ? $parentProgram->id : '', "class='form-control chosen' onchange=setAclList(this.value)");?> + id) ? $parentProgram->id : 0, "class='form-control chosen' onchange=setAclList(this.value)");?>