From 2bebcba7055de4be49835f093284f251c56f1131 Mon Sep 17 00:00:00 2001 From: chentao Date: Tue, 20 Jun 2023 10:36:55 +0800 Subject: [PATCH] * Move configurations of search form into seperate config file within program module. --- module/program/config.php | 29 ----------------------------- module/program/config/search.php | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 module/program/config/search.php diff --git a/module/program/config.php b/module/program/config.php index 63950fa6c7..f3441ada7a 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -23,32 +23,3 @@ $config->program->sortFields = new stdclass(); $config->program->sortFields->id = 'id'; $config->program->sortFields->begin = 'begin'; $config->program->sortFields->end = 'end'; - -global $lang; -$config->program->search['module'] = 'program'; -$config->program->search['fields']['name'] = $lang->program->name; -$config->program->search['fields']['status'] = $lang->program->status; -$config->program->search['fields']['PM'] = $lang->program->PM; -$config->program->search['fields']['openedDate'] = $lang->program->openedDate; -$config->program->search['fields']['openedBy'] = $lang->program->openedBy; -$config->program->search['fields']['begin'] = $lang->program->begin; -$config->program->search['fields']['end'] = $lang->program->end; -$config->program->search['fields']['realBegan'] = $lang->program->realBegan; -$config->program->search['fields']['realEnd'] = $lang->program->realEnd; -$config->program->search['fields']['closedDate'] = $lang->program->closedDate; -$config->program->search['fields']['lastEditedDate'] = $lang->program->lastEditedDate; -$config->program->search['fields']['desc'] = $lang->program->desc; - -/* This is an ordered array. */ -$config->program->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->program->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $lang->program->statusList); -$config->program->search['params']['PM'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->program->search['params']['openedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->program->search['params']['begin'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['end'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['realBegan'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['realEnd'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['closedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); -$config->program->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); diff --git a/module/program/config/search.php b/module/program/config/search.php new file mode 100644 index 0000000000..0e5525901e --- /dev/null +++ b/module/program/config/search.php @@ -0,0 +1,29 @@ +program->search['module'] = 'program'; +$config->program->search['fields']['name'] = $lang->program->name; +$config->program->search['fields']['status'] = $lang->program->status; +$config->program->search['fields']['PM'] = $lang->program->PM; +$config->program->search['fields']['openedDate'] = $lang->program->openedDate; +$config->program->search['fields']['openedBy'] = $lang->program->openedBy; +$config->program->search['fields']['begin'] = $lang->program->begin; +$config->program->search['fields']['end'] = $lang->program->end; +$config->program->search['fields']['realBegan'] = $lang->program->realBegan; +$config->program->search['fields']['realEnd'] = $lang->program->realEnd; +$config->program->search['fields']['closedDate'] = $lang->program->closedDate; +$config->program->search['fields']['lastEditedDate'] = $lang->program->lastEditedDate; +$config->program->search['fields']['desc'] = $lang->program->desc; + +/* This is an ordered array. */ +$config->program->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->program->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $lang->program->statusList); +$config->program->search['params']['PM'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->program->search['params']['openedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->program->search['params']['begin'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['end'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['realBegan'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['realEnd'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['closedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); +$config->program->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => '');