Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -40,7 +40,7 @@ $config->program->sortFields->PRJBudget = 'budget';
|
||||
|
||||
global $lang;
|
||||
$config->program->datatable = new stdclass();
|
||||
$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJModel', 'PRJPM', 'begin', 'end', 'PRJStatus', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions');
|
||||
$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJCode', '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';
|
||||
@@ -53,6 +53,12 @@ $config->program->datatable->fieldList['PRJName']['width'] = 'auto';
|
||||
$config->program->datatable->fieldList['PRJName']['required'] = 'yes';
|
||||
$config->program->datatable->fieldList['PRJName']['sort'] = 'no';
|
||||
|
||||
$config->program->datatable->fieldList['PRJCode']['title'] = 'PRJCode';
|
||||
$config->program->datatable->fieldList['PRJCode']['fixed'] = 'left';
|
||||
$config->program->datatable->fieldList['PRJCode']['width'] = '100';
|
||||
$config->program->datatable->fieldList['PRJCode']['required'] = 'yes';
|
||||
$config->program->datatable->fieldList['PRJCode']['sort'] = 'no';
|
||||
|
||||
$config->program->datatable->fieldList['PRJModel']['title'] = 'PRJModel';
|
||||
$config->program->datatable->fieldList['PRJModel']['fixed'] = 'left';
|
||||
$config->program->datatable->fieldList['PRJModel']['width'] = '80';
|
||||
|
||||
@@ -1416,8 +1416,10 @@ class programModel extends model
|
||||
break;
|
||||
case 'PRJName':
|
||||
$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);
|
||||
echo html::a($projectLink, $project->name);
|
||||
break;
|
||||
case 'PRJCode':
|
||||
echo $project->code;
|
||||
break;
|
||||
case 'PRJModel':
|
||||
echo zget($this->lang->program->modelList, $project->model);
|
||||
|
||||
Reference in New Issue
Block a user