* adjust code.

This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-25 09:06:53 +00:00
parent 49cf4a6287
commit 45ed4750a9
8 changed files with 33 additions and 12 deletions
+1
View File
@@ -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)
+2 -2
View File
@@ -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;
+1
View File
@@ -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";
+1
View File
@@ -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 = "新增产品";
+23 -8
View File
@@ -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;
}
+3 -2
View File
@@ -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;
+1
View File
@@ -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';
+1
View File
@@ -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 = '更新燃尽图';