From 8b11c570b692edaaed2e4e325495d759e94dfa77 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Sun, 13 Mar 2011 07:12:50 +0000 Subject: [PATCH] * change for search --- module/doc/config.php | 2 -- module/project/config.php | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/module/doc/config.php b/module/doc/config.php index 1bbcf6a09b..3db4a74af2 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -20,7 +20,6 @@ $config->doc->search['fields']['lib'] = $lang->doc->lib; $config->doc->search['fields']['digest'] = $lang->doc->digest; $config->doc->search['fields']['content'] = $lang->doc->content; $config->doc->search['fields']['url'] = $lang->doc->url; -$config->doc->search['fields']['views'] = $lang->doc->views; $config->doc->search['fields']['addedBy'] = $lang->doc->addedBy; $config->doc->search['fields']['addedDate'] = $lang->doc->addedDate; $config->doc->search['fields']['editedBy'] = $lang->doc->editedBy; @@ -36,7 +35,6 @@ $config->doc->search['params']['lib'] = array('operator' => '=', $config->doc->search['params']['digest'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->doc->search['params']['content'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->doc->search['params']['url'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->doc->search['params']['views'] = array('operator' => '>', 'control' => 'input', 'values' => '' ); $config->doc->search['params']['addedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->doc->search['params']['addedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); $config->doc->search['params']['editedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); diff --git a/module/project/config.php b/module/project/config.php index 07a4aa6282..a30684e5bd 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -10,7 +10,6 @@ $config->project->editor->edit = array('id' => 'desc,goal', 'tools' => 'simple $config->project->search['module'] = 'task'; $config->project->search['fields']['name'] = $lang->task->name; $config->project->search['fields']['id'] = $lang->task->id; -$config->project->search['fields']['story'] = $lang->task->story; $config->project->search['fields']['project'] = $lang->task->project; $config->project->search['fields']['type'] = $lang->task->type; $config->project->search['fields']['mailto'] = $lang->task->mailto; @@ -35,7 +34,6 @@ $config->project->search['fields']['closedReason'] = $lang->task->closedReason $config->project->search['fields']['lastEdited'] = $lang->task->lastEdited; $config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->project->search['params']['story'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->project->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->project->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); @@ -44,9 +42,14 @@ $config->project->search['params']['closedBy'] = array('operator' => '=', $config->project->search['params']['cancelBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->project->search['params']['lastEdited'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->project->search['params']['finishedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['mailto'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); $config->project->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); -$config->project->search['params']['sclosedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); +$config->project->search['params']['closedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); $config->project->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); $config->project->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->typeList); - +$config->project->search['params']['assignedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['openedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['finishedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['closedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['canceledDate'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['deadline'] = array('operator' => '>=', 'control' => 'input', 'values' => '');