diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index d85a7bb358..63d4b8f82e 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -11,7 +11,7 @@ */ ?> -
+

branch->manageTitle, $this->lang->product->branchName[$this->session->currentProductType])?>

@@ -53,6 +53,6 @@ -
+
diff --git a/module/project/config.php b/module/project/config.php index e28c1dbbec..7e59ea03bc 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -11,7 +11,7 @@ $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simple $config->project->editor->view = array('id' => 'lastComment', 'tools' => 'simpleTools'); $config->project->list = new stdclass(); -$config->project->list->exportFields = 'id,parent,name,linkedProducts,status,begin,end,budget,PM,end,desc'; +$config->project->list->exportFields = 'id,parent,code,name,linkedProducts,status,begin,end,budget,PM,end,desc'; $config->project->create = new stdclass(); $config->project->edit = new stdclass(); @@ -27,7 +27,7 @@ $config->project->sortFields->budget = 'budget'; global $lang; $config->project->datatable = new stdclass(); -$config->project->datatable->defaultField = array('id', 'name', 'PM', 'status', 'begin', 'end', 'budget', 'teamCount','estimate','consume', 'progress', 'actions'); +$config->project->datatable->defaultField = array('id', 'name', 'code' , 'PM', 'status', 'begin', 'end', 'budget', 'teamCount','estimate','consume', 'progress', 'actions'); $config->project->datatable->fieldList['id']['title'] = 'ID'; $config->project->datatable->fieldList['id']['fixed'] = 'left'; @@ -43,6 +43,14 @@ $config->project->datatable->fieldList['name']['required'] = 'yes'; $config->project->datatable->fieldList['name']['sort'] = 'no'; $config->project->datatable->fieldList['name']['pri'] = '1'; +$config->project->datatable->fieldList['code']['title'] = 'code'; +$config->project->datatable->fieldList['code']['fixed'] = 'left'; +$config->project->datatable->fieldList['code']['width'] = '100'; +$config->project->datatable->fieldList['code']['minWidth'] = '180'; +$config->project->datatable->fieldList['code']['required'] = 'yes'; +$config->project->datatable->fieldList['code']['sort'] = 'no'; +$config->project->datatable->fieldList['code']['pri'] = '1'; + $config->project->datatable->fieldList['PM']['title'] = 'PM'; $config->project->datatable->fieldList['PM']['fixed'] = 'no'; $config->project->datatable->fieldList['PM']['width'] = '80'; diff --git a/module/project/control.php b/module/project/control.php index 991549a75c..b862ee5685 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -272,7 +272,6 @@ class project extends control $this->view->title = $this->lang->project->browse; $this->view->position[] = $this->lang->project->browse; - $this->view->projectStats = $projectStats; $this->view->pager = $pager; $this->view->programID = $programID; diff --git a/module/project/model.php b/module/project/model.php index 24dcbda385..17d4d589d7 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1491,6 +1491,9 @@ class projectModel extends model if(!empty($suffix)) echo $suffix; if(!empty($suffix) || !empty($prefix)) echo '
'; break; + case 'code': + echo $project->code; + break; case 'PM': $user = $this->loadModel('user')->getByID($project->PM, 'account'); $userID = !empty($user) ? $user->id : ''; diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index fee692f71b..b51cf6bb88 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -91,9 +91,8 @@ $useDatatable = !commonModel::isTutorialMode() and (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); $setting = $this->datatable->getSetting('project'); $fixedFieldsWidth = $this->datatable->setFixedFieldWidth($setting); - if($useDatatable) include '../../common/view/datatable.html.php'; - ?> +?> ';?> ' data-fixed-left-width='' data-fixed-right-width=''> config->systemMode == 'new' ? common::hasPriv('project', 'batchEdit') : common::hasPriv('project', 'batchEdit');?>