*Optimize the code.
This commit is contained in:
@@ -136,7 +136,7 @@ $config->project->search['module'] = 'project';
|
||||
$config->project->search['fields']['name'] = $lang->project->name;
|
||||
$config->project->search['fields']['code'] = $lang->project->code;
|
||||
$config->project->search['fields']['id'] = $lang->project->id;
|
||||
$config->project->search['fields']['model'] = $lang->project->manageType;
|
||||
$config->project->search['fields']['model'] = $lang->project->model;
|
||||
$config->project->search['fields']['parent'] = $lang->project->parent;
|
||||
$config->project->search['fields']['status'] = $lang->project->projectStatus;
|
||||
$config->project->search['fields']['desc'] = $lang->project->desc;
|
||||
|
||||
@@ -66,7 +66,6 @@ $lang->project->id = '项目编号';
|
||||
$lang->project->project = '所属项目';
|
||||
$lang->project->stage = '阶段';
|
||||
$lang->project->model = '项目管理方式';
|
||||
$lang->project->manageType = '管理类型';
|
||||
$lang->project->PM = '负责人';
|
||||
$lang->project->PO = '项目负责人';
|
||||
$lang->project->QD = '测试负责人';
|
||||
@@ -163,6 +162,7 @@ $lang->project->branch = '所属分支';
|
||||
$lang->project->plan = '所属计划';
|
||||
$lang->project->createKanban = '添加看板';
|
||||
$lang->project->kanban = '看板';
|
||||
$lang->project->search = '搜索';
|
||||
|
||||
/* Project Kanban. */
|
||||
$lang->project->typeList = array();
|
||||
|
||||
@@ -637,10 +637,9 @@ class projectModel extends model
|
||||
* */
|
||||
public function getBySearch($projectQuery)
|
||||
{
|
||||
$flag = stripos($projectQuery, 'and') + 3;
|
||||
$projectQuery = substr_replace($projectQuery, " (`type` = 'project') and", $flag, 0);
|
||||
$projects = $this->dao->select('*')->from(TABLE_PROJECT)
|
||||
->where($projectQuery)
|
||||
->andWhere('type')->eq('project')
|
||||
->fetchAll();
|
||||
return $projects;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<?php echo html::a(inlink('browse', "programID=$programID&browseType=$key"), $label, '', "class='btn btn-link $active'");?>
|
||||
<?php endforeach;?>
|
||||
<?php echo html::checkbox('involved', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
|
||||
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo '搜索';?></a>
|
||||
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->project->search;?></a>
|
||||
</div>
|
||||
<div class="btn-toolbar pull-right">
|
||||
<div class="btn-group panel-actions">
|
||||
|
||||
Reference in New Issue
Block a user