From 45ed4750a93048e0f88600930caef1be44b6ad89 Mon Sep 17 00:00:00 2001 From: "shiyangyangwork@yahoo.cn" Date: Tue, 25 Oct 2011 09:06:53 +0000 Subject: [PATCH] * adjust code. --- module/bug/model.php | 1 + module/product/control.php | 4 ++-- module/product/lang/en.php | 1 + module/product/lang/zh-cn.php | 1 + module/product/model.php | 31 +++++++++++++++++++++++-------- module/project/control.php | 5 +++-- module/project/lang/en.php | 1 + module/project/lang/zh-cn.php | 1 + 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index e18be2707b..43b034b5cc 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -44,6 +44,7 @@ class bugModel extends model $bug = fixer::input('post') ->add('openedBy', $this->app->user->account) ->add('openedDate', $now) + ->add('status', 'active') ->setDefault('project,story,task', 0) ->setDefault('openedBuild', '') ->setIF($this->post->assignedTo != '', 'assignedDate', $now) diff --git a/module/product/control.php b/module/product/control.php index 6107c6f742..642b7772cf 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -315,8 +315,8 @@ class product extends control $period = $type == 'account' ? 'all' : $type; /* The header and position. */ - $this->view->header->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->dynamic; - $this->view->position[] = $this->lang->company->dynamic; + $this->view->header->title = $this->lang->product->dynamic; + $this->view->position[] = $this->lang->product->dynamic; /* Assign. */ $this->view->productID = $productID; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 9154511d3f..0e44b4ab38 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -12,6 +12,7 @@ $lang->product->common = 'Product'; $lang->product->index = "Index"; $lang->product->browse = "Browse"; +$lang->product->dynamic= "Dynamic"; $lang->product->view = "Info"; $lang->product->edit = "Edit"; $lang->product->create = "Create"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 868fa62d35..cffdbad0b0 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -12,6 +12,7 @@ $lang->product->common = '产品视图'; $lang->product->index = "产品首页"; $lang->product->browse = "浏览产品"; +$lang->product->dynamic= "动态"; $lang->product->view = "产品信息"; $lang->product->edit = "编辑产品"; $lang->product->create = "新增产品"; diff --git a/module/product/model.php b/module/product/model.php index fb31c29fae..a69550c283 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -266,14 +266,29 @@ class productModel extends model */ public function getProjectPairs($productID, $param = 'all') { - $projects = $this->dao->select('t2.id, t2.name') - ->from(TABLE_PROJECTPRODUCT)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2') - ->on('t1.project = t2.id') - ->where('t1.product')->eq((int)$productID) - ->beginIF($param == 'nodeleted')->andWhere('t2.deleted')->eq('0')->fi() - ->orderBy('t1.project desc') - ->fetchPairs(); - $projects = array('' => '') + $projects; + if($param == 'nodeleted') + { + $datas = $this->dao->select('t2.id, t2.name,t2.deleted') + ->from(TABLE_PROJECTPRODUCT)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2') + ->on('t1.project = t2.id') + ->where('t1.product')->eq((int)$productID) + ->orderBy('t1.project desc') + ->fetchAll(); + foreach($datas as $data) + { + if($data->deleted == 0) $projects[$data->id] = $data->name; + } + } + else + { + $projects = $this->dao->select('t2.id, t2.name') + ->from(TABLE_PROJECTPRODUCT)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2') + ->on('t1.project = t2.id') + ->where('t1.product')->eq((int)$productID) + ->orderBy('t1.project desc') + ->fetchPairs(); + $projects = array('' => '') + $projects; + } return $projects; } diff --git a/module/project/control.php b/module/project/control.php index 6c4712132c..0d3f06631f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -916,8 +916,9 @@ class project extends control $period = $type == 'account' ? 'all' : $type; /* The header and position. */ - $this->view->header->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->dynamic; - $this->view->position[] = $this->lang->company->dynamic; + $project = $this->project->getByID($projectID); + $this->view->header->title = $project->name . $this->lang->colon . $this->lang->project->dynamic; + $this->view->position[] = $this->lang->project->dynamic; /* Assign. */ $this->view->projectID = $projectID; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 876f1d4231..838cd5a0fc 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -68,6 +68,7 @@ $lang->project->task = 'Task'; $lang->project->groupTask = 'View task by group'; $lang->project->story = 'Story'; $lang->project->bug = 'Bug'; +$lang->project->dynamic = 'Dynamic'; $lang->project->build = 'Build'; $lang->project->burn = 'Burndown chart'; $lang->project->computeBurn = 'Update burndown'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 031df16f11..3b8d092ea5 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -68,6 +68,7 @@ $lang->project->task = '任务列表'; $lang->project->groupTask = '分组浏览任务'; $lang->project->story = '需求列表'; $lang->project->bug = 'Bug列表'; +$lang->project->dynamic = '动态'; $lang->project->build = 'Build列表'; $lang->project->burn = '燃尽图'; $lang->project->computeBurn = '更新燃尽图';