From 7eed8e4a2b0646421945a8a6b82f6934e0bc295a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 19 Jul 2022 13:52:40 +0800 Subject: [PATCH] * Finish task #61180. --- module/project/config.php | 17 ++++++++++------- module/project/view/batchedit.html.php | 5 +++-- module/project/view/create.html.php | 2 ++ module/project/view/edit.html.php | 2 ++ module/project/view/view.html.php | 3 ++- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/module/project/config.php b/module/project/config.php index e86ae4721a..e742862ec9 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -49,13 +49,16 @@ $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'] = 'no'; -$config->project->datatable->fieldList['code']['sort'] = 'no'; -$config->project->datatable->fieldList['code']['pri'] = '1'; +if(!isset($config->setCode) or $config->setCode == 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'] = 'no'; + $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'; diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 2ce4a609f4..955352af03 100644 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -19,6 +19,7 @@

project->batchEdit;?>

+ setCode) and $config->setCode == 0) ? 'hidden' : '';?>
@@ -26,7 +27,7 @@ - + @@ -51,7 +52,7 @@ - + + setCode) or $config->setCode == 1):?> + diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index f58d75b508..eb68ff2970 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -61,10 +61,12 @@ + setCode) or $config->setCode == 1):?> + diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 48457ad88d..95ebb4e235 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -107,7 +107,8 @@
-

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

+ setCode) and $config->setCode == 0) ? 'hidden' : '';?> +

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

idAB;?> project->parent;?> project->name;?>project->code;?>project->code;?> project->PM;?> project->begin;?> project->end;?>parent, "class='form-control chosen' data-id='$projectID' data-name='{$project->name}' data-parent='{$project->parent}'");?> name, "class='form-control'");?>code, "class='form-control'");?>code, "class='form-control'");?> PM, "class='form-control chosen'");?> begin, "class='form-control form-date' onchange='computeWorkDays(this.id);' placeholder='" . $lang->project->begin . "'");?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 4c1e257bba..4866641897 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -55,10 +55,12 @@ project->name;?>
project->code;?>
project->PM;?> project->name;?> name, "class='form-control' required");?>
project->code;?> code, "class='form-control' required");?>
project->PM;?> PM, "class='form-control chosen'" . (strpos($requiredFields, 'PM') !== false ? ' required' : ''));?>