* Fix bug.
This commit is contained in:
leiyong
@@ -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);
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class='w-140px'><?php echo $lang->product->program;?></th>
|
||||
<td><?php echo html::select('program', $programs, $product->program, "class='form-control chosen' required");?></td><td></td>
|
||||
</tr>
|
||||
<td><?php echo zget($programs, $product->program, '/');?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->product->name;?></th>
|
||||
<td class='w-p40-f'><?php echo html::input('name', $product->name, "class='form-control' required");?></td><td></td>
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 = " <span class='label label-badge label-info label-outline'>$project->code</span>";
|
||||
echo html::a($projectLink, $project->name . $projectCode);
|
||||
break;
|
||||
case 'PRJModel':
|
||||
echo zget($this->lang->program->modelList, $project->model);
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<?php
|
||||
/**
|
||||
* The create view of project module of ZenTaoPMS.
|
||||
* The pgmcreate view of project module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @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 @@
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th><?php echo $lang->program->PGMParent;?></th>
|
||||
<td><?php echo html::select('parent', $parents, isset($parentProgram->id) ? $parentProgram->id : '', "class='form-control chosen' onchange=setAclList(this.value)");?>
|
||||
<td><?php echo html::select('parent', $parents, isset($parentProgram->id) ? $parentProgram->id : 0, "class='form-control chosen' onchange=setAclList(this.value)");?>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user