From e23be60bb7a82b1968940d637080b93cfe3c2bf7 Mon Sep 17 00:00:00 2001 From: "shiyangyangwork@yahoo.cn" Date: Wed, 28 Dec 2011 06:23:44 +0000 Subject: [PATCH] * adjust code for add files to story from bug and search for dynamic in company. --- module/action/lang/en.php | 65 ++++++++++++++-------------- module/action/lang/zh-cn.php | 65 ++++++++++++++-------------- module/company/config.php | 2 - module/company/control.php | 30 ++++++------- module/company/view/dynamic.html.php | 20 ++++----- module/story/model.php | 16 +++++++ 6 files changed, 107 insertions(+), 91 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index e098b554ea..e11d585996 100644 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -147,35 +147,36 @@ $lang->action->label->user = 'user'; $lang->action->label->space = ' '; /* Display action for search. */ -$lang->action->search->label->created = $lang->action->label->created; -$lang->action->search->label->opened = $lang->action->label->opened; -$lang->action->search->label->changed = $lang->action->label->changed; -$lang->action->search->label->edited = $lang->action->label->edited; -$lang->action->search->label->assigned = $lang->action->label->assigned; -$lang->action->search->label->closed = $lang->action->label->closed; -$lang->action->search->label->deleted = $lang->action->label->deleted; -$lang->action->search->label->deletedfile = $lang->action->label->deletedfile; -$lang->action->search->label->editfile = $lang->action->label->editfile; -$lang->action->search->label->erased = $lang->action->label->erased; -$lang->action->search->label->undeleted = $lang->action->label->undeleted; -$lang->action->search->label->commented = $lang->action->label->commented; -$lang->action->search->label->activated = $lang->action->label->activated; -$lang->action->search->label->resolved = $lang->action->label->resolved; -$lang->action->search->label->reviewed = $lang->action->label->reviewed; -$lang->action->search->label->moved = $lang->action->label->moved; -$lang->action->search->label->confirmed = $lang->action->label->confirmed; -$lang->action->search->label->bugconfirmed = $lang->action->label->bugconfirmed; -$lang->action->search->label->tostory = $lang->action->label->tostory; -$lang->action->search->label->frombug = $lang->action->label->frombug; -$lang->action->search->label->totask = $lang->action->label->totask; -$lang->action->search->label->svncommited = $lang->action->label->svncommited; -$lang->action->search->label->linked2plan = $lang->action->label->linked2plan; -$lang->action->search->label->unlinkedfromplan = $lang->action->label->unlinkedfromplan; -$lang->action->search->label->linked2project = $lang->action->label->linked2project; -$lang->action->search->label->unlinkedfromproject = $lang->action->label->unlinkedfromproject; -$lang->action->search->label->marked = $lang->action->label->marked; -$lang->action->search->label->started = $lang->action->label->started; -$lang->action->search->label->canceled = $lang->action->label->canceled; -$lang->action->search->label->finished = $lang->action->label->finished; -$lang->action->search->label->login = $lang->action->label->login; -$lang->action->search->label->logout = $lang->action->label->logout; +$lang->action->search->label[''] = ''; +$lang->action->search->label['created'] = $lang->action->label->created; +$lang->action->search->label['opened'] = $lang->action->label->opened; +$lang->action->search->label['changed'] = $lang->action->label->changed; +$lang->action->search->label['edited'] = $lang->action->label->edited; +$lang->action->search->label['assigned'] = $lang->action->label->assigned; +$lang->action->search->label['closed'] = $lang->action->label->closed; +$lang->action->search->label['deleted'] = $lang->action->label->deleted; +$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile; +$lang->action->search->label['editfile'] = $lang->action->label->editfile; +$lang->action->search->label['erased'] = $lang->action->label->erased; +$lang->action->search->label['undeleted'] = $lang->action->label->undeleted; +$lang->action->search->label['commented'] = $lang->action->label->commented; +$lang->action->search->label['activated'] = $lang->action->label->activated; +$lang->action->search->label['resolved'] = $lang->action->label->resolved; +$lang->action->search->label['reviewed'] = $lang->action->label->reviewed; +$lang->action->search->label['moved'] = $lang->action->label->moved; +$lang->action->search->label['confirmed'] = $lang->action->label->confirmed; +$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed; +$lang->action->search->label['tostory'] = $lang->action->label->tostory; +$lang->action->search->label['frombug'] = $lang->action->label->frombug; +$lang->action->search->label['totask'] = $lang->action->label->totask; +$lang->action->search->label['svncommited'] = $lang->action->label->svncommited; +$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan; +$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan; +$lang->action->search->label['linked2project'] = $lang->action->label->linked2project; +$lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject; +$lang->action->search->label['marked'] = $lang->action->label->marked; +$lang->action->search->label['started'] = $lang->action->label->started; +$lang->action->search->label['canceled'] = $lang->action->label->canceled; +$lang->action->search->label['finished'] = $lang->action->label->finished; +$lang->action->search->label['login'] = $lang->action->label->login; +$lang->action->search->label['logout'] = $lang->action->label->logout; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 32e39b98f5..2dab28793b 100644 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -147,35 +147,36 @@ $lang->action->label->user = '用户'; $lang->action->label->space = '　'; /* 用来在动态显示中显示动作 */ -$lang->action->search->label->created = $lang->action->label->created; -$lang->action->search->label->opened = $lang->action->label->opened; -$lang->action->search->label->changed = $lang->action->label->changed; -$lang->action->search->label->edited = $lang->action->label->edited; -$lang->action->search->label->assigned = $lang->action->label->assigned; -$lang->action->search->label->closed = $lang->action->label->closed; -$lang->action->search->label->deleted = $lang->action->label->deleted; -$lang->action->search->label->deletedfile = $lang->action->label->deletedfile; -$lang->action->search->label->editfile = $lang->action->label->editfile; -$lang->action->search->label->erased = $lang->action->label->erased; -$lang->action->search->label->undeleted = $lang->action->label->undeleted; -$lang->action->search->label->commented = $lang->action->label->commented; -$lang->action->search->label->activated = $lang->action->label->activated; -$lang->action->search->label->resolved = $lang->action->label->resolved; -$lang->action->search->label->reviewed = $lang->action->label->reviewed; -$lang->action->search->label->moved = $lang->action->label->moved; -$lang->action->search->label->confirmed = $lang->action->label->confirmed; -$lang->action->search->label->bugconfirmed = $lang->action->label->bugconfirmed; -$lang->action->search->label->tostory = $lang->action->label->tostory; -$lang->action->search->label->frombug = $lang->action->label->frombug; -$lang->action->search->label->totask = $lang->action->label->totask; -$lang->action->search->label->svncommited = $lang->action->label->svncommited; -$lang->action->search->label->linked2plan = $lang->action->label->linked2plan; -$lang->action->search->label->unlinkedfromplan = $lang->action->label->unlinkedfromplan; -$lang->action->search->label->linked2project = $lang->action->label->linked2project; -$lang->action->search->label->unlinkedfromproject = $lang->action->label->unlinkedfromproject; -$lang->action->search->label->marked = $lang->action->label->marked; -$lang->action->search->label->started = $lang->action->label->started; -$lang->action->search->label->canceled = $lang->action->label->canceled; -$lang->action->search->label->finished = $lang->action->label->finished; -$lang->action->search->label->login = $lang->action->label->login; -$lang->action->search->label->logout = $lang->action->label->logout; +$lang->action->search->label[''] = ''; +$lang->action->search->label['created'] = $lang->action->label->created; +$lang->action->search->label['opened'] = $lang->action->label->opened; +$lang->action->search->label['changed'] = $lang->action->label->changed; +$lang->action->search->label['edited'] = $lang->action->label->edited; +$lang->action->search->label['assigned'] = $lang->action->label->assigned; +$lang->action->search->label['closed'] = $lang->action->label->closed; +$lang->action->search->label['deleted'] = $lang->action->label->deleted; +$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile; +$lang->action->search->label['editfile'] = $lang->action->label->editfile; +$lang->action->search->label['erased'] = $lang->action->label->erased; +$lang->action->search->label['undeleted'] = $lang->action->label->undeleted; +$lang->action->search->label['commented'] = $lang->action->label->commented; +$lang->action->search->label['activated'] = $lang->action->label->activated; +$lang->action->search->label['resolved'] = $lang->action->label->resolved; +$lang->action->search->label['reviewed'] = $lang->action->label->reviewed; +$lang->action->search->label['moved'] = $lang->action->label->moved; +$lang->action->search->label['confirmed'] = $lang->action->label->confirmed; +$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed; +$lang->action->search->label['tostory'] = $lang->action->label->tostory; +$lang->action->search->label['frombug'] = $lang->action->label->frombug; +$lang->action->search->label['totask'] = $lang->action->label->totask; +$lang->action->search->label['svncommited'] = $lang->action->label->svncommited; +$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan; +$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan; +$lang->action->search->label['linked2project'] = $lang->action->label->linked2project; +$lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject; +$lang->action->search->label['marked'] = $lang->action->label->marked; +$lang->action->search->label['started'] = $lang->action->label->started; +$lang->action->search->label['canceled'] = $lang->action->label->canceled; +$lang->action->search->label['finished'] = $lang->action->label->finished; +$lang->action->search->label['login'] = $lang->action->label->login; +$lang->action->search->label['logout'] = $lang->action->label->logout; diff --git a/module/company/config.php b/module/company/config.php index 45815159cc..a33225b140 100644 --- a/module/company/config.php +++ b/module/company/config.php @@ -11,7 +11,6 @@ $config->company->dynamic->search['fields']['objectID'] = $lang->action->objec $config->company->dynamic->search['fields']['project'] = $lang->action->project; $config->company->dynamic->search['fields']['objectType'] = $lang->action->objectType; $config->company->dynamic->search['fields']['date'] = $lang->action->date; -$config->company->dynamic->search['fields']['actionID'] = $lang->action->actionID; $config->company->dynamic->search['fields']['action'] = $lang->action->action; $config->company->dynamic->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => ''); @@ -20,5 +19,4 @@ $config->company->dynamic->search['params']['objectID'] = array('operator' => $config->company->dynamic->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->company->dynamic->search['params']['objectType'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->action->search->objectTypeList); $config->company->dynamic->search['params']['date'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); -$config->company->dynamic->search['params']['actionID'] = array('operator' => '>=', 'control' => 'input', 'values' => ''); $config->company->dynamic->search['params']['action'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->action->search->label); diff --git a/module/company/control.php b/module/company/control.php index edc5225d2c..b06dbf33f0 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -140,7 +140,7 @@ class company extends control /** * Company dynamic. * - * @param string $type + * @param string $browseType * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -148,7 +148,7 @@ class company extends control * @access public * @return void */ - public function dynamic($type = 'today', $param = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function dynamic($browseType = 'today', $param = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { $this->app->loadLang('user'); $this->app->loadLang('project'); @@ -174,11 +174,11 @@ class company extends control $this->view->pager = $pager; /* Set the user and type. */ - $account = $type == 'account' ? $param : 'all'; - $product = $type == 'product' ? $param : 'all'; - $project = $type == 'project' ? $param : 'all'; - $period = ($type == 'account' or $type == 'product' or $type == 'project') ? 'all' : $type; - $queryID = ($type == 'bysearch') ? (int)$param : 0; + $account = $browseType == 'account' ? $param : 'all'; + $product = $browseType == 'product' ? $param : 'all'; + $project = $browseType == 'project' ? $param : 'all'; + $period = ($browseType == 'account' or $browseType == 'product' or $browseType == 'project') ? 'all' : $browseType; + $queryID = ($browseType == 'bysearch') ? (int)$param : 0; /* Get products' list.*/ $products = $this->loadModel('product')->getPairs(); @@ -200,7 +200,7 @@ class company extends control $this->view->position[] = $this->lang->company->dynamic; /* Get actions. */ - if($type != 'bysearch') + if($browseType != 'bysearch') { $actions = $this->action->getDynamic($account, $period, $orderBy, $pager, $product, $project); } @@ -217,7 +217,7 @@ class company extends control ksort($products); $projects['all'] = $this->lang->project->allProject; $products['all'] = $this->lang->product->allProduct; - $this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "type=bysearch¶m=myQueryID"); + $this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "browseType=bysearch¶m=myQueryID"); $this->config->company->dynamic->search['queryID'] = $queryID; $this->config->company->dynamic->search['params']['project']['values'] = $projects; $this->config->company->dynamic->search['params']['product']['values'] = $products; @@ -225,12 +225,12 @@ class company extends control $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->company->dynamic->search); /* Assign. */ - $this->view->type = $type; - $this->view->account = $account; - $this->view->product = $product; - $this->view->project = $project; - $this->view->queryID = $queryID; - $this->view->actions = $actions; + $this->view->browseType = $browseType; + $this->view->account = $account; + $this->view->product = $product; + $this->view->project = $project; + $this->view->queryID = $queryID; + $this->view->actions = $actions; $this->display(); } } diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 9c365d2824..59fb4f5d94 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -13,18 +13,18 @@
' . html::a(inlink('dynamic', "type=today"), $lang->action->dynamic->today) . ''; - echo '' . html::a(inlink('dynamic', "type=yesterday"), $lang->action->dynamic->yesterday) . ''; - echo '' . html::a(inlink('dynamic', "type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . ''; - echo '' . html::a(inlink('dynamic', "type=thisweek"), $lang->action->dynamic->thisWeek) . ''; - echo '' . html::a(inlink('dynamic', "type=lastweek"), $lang->action->dynamic->lastWeek) . ''; - echo '' . html::a(inlink('dynamic', "type=thismonth"), $lang->action->dynamic->thisMonth) . ''; - echo '' . html::a(inlink('dynamic', "type=lastmonth"), $lang->action->dynamic->lastMonth) . ''; - echo '' . html::a(inlink('dynamic', "type=all"), $lang->action->dynamic->all) . ''; + echo '' . html::a(inlink('dynamic', "browseType=today"), $lang->action->dynamic->today) . ''; + echo '' . html::a(inlink('dynamic', "browseType=yesterday"), $lang->action->dynamic->yesterday) . ''; + echo '' . html::a(inlink('dynamic', "browseType=twodaysago"), $lang->action->dynamic->twoDaysAgo) . ''; + echo '' . html::a(inlink('dynamic', "browseType=thisweek"), $lang->action->dynamic->thisWeek) . ''; + echo '' . html::a(inlink('dynamic', "browseType=lastweek"), $lang->action->dynamic->lastWeek) . ''; + echo '' . html::a(inlink('dynamic', "browseType=thismonth"), $lang->action->dynamic->thisMonth) . ''; + echo '' . html::a(inlink('dynamic', "browseType=lastmonth"), $lang->action->dynamic->lastMonth) . ''; + echo '' . html::a(inlink('dynamic', "browseType=all"), $lang->action->dynamic->all) . ''; echo "" . html::select('account', $users, $account, 'onchange=changeUser(this.value)') . ''; echo "" . html::select('product', $products, $product, 'onchange=changeProduct(this.value)') . ''; echo "" . html::select('project', $projects, $project, 'onchange=changeProject(this.value)') . ''; @@ -58,5 +58,5 @@ var browseType = ''; show();?> - + diff --git a/module/story/model.php b/module/story/model.php index 9c82bc0b37..ef8c2d8bd1 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -157,6 +157,22 @@ class storyModel extends model $this->loadModel('action')->create('bug', $bugID, 'ToStory', '', $storyID); $this->action->create('bug', $bugID, 'Closed'); + + /* add files to story from bug. */ + $files = $this->dao->select('*')->from(TABLE_FILE) + ->where('objectType')->eq('bug') + ->andWhere('objectID')->eq($bugID) + ->fetchAll(); + if(!empty($files)) + { + foreach($files as $file) + { + $file->objectType = 'story'; + $file->objectID = $storyID; + unset($file->id); + $this->dao->insert(TABLE_FILE)->data($file)->exec(); + } + } } return $storyID; }