diff --git a/module/block/control.php b/module/block/control.php index 015398f326..ca3e646c7c 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -784,7 +784,17 @@ class block extends control $type = isset($this->params->type) ? $this->params->type : ''; $pager = pager::init(0, $count , 1); - $productStats = $this->loadModel('product')->getStats('order_desc', $pager, $type); + $productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + $productIdList = array(); + foreach($productStats as $product) $productIdList[] = $product->id; + + $this->view->executions = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($productIdList) + ->andWhere('t2.type')->in('stage,sprint') + ->andWhere('t2.deleted')->eq(0) + ->orderBy('t1.project') + ->fetchPairs('product', 'name'); $this->view->productStats = $productStats; } diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 85a348b0d6..1e447f6469 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -21,6 +21,9 @@ product->name;?> + + product->currentExecution;?> + product->plans;?> product->releases;?> product->activeStories;?> @@ -35,6 +38,10 @@ ?> > name?> + + id, '');?> + + plans?> releases?> stories['active']?> diff --git a/module/design/control.php b/module/design/control.php index c6b8868cd6..c85a751cda 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -141,6 +141,7 @@ class design extends control $this->send($response); } + $this->design->setProductMenu($productID); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate; $this->view->position[] = $this->lang->design->batchCreate; diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 64aca7bbe8..3ae9a88e14 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . 'Liste'; $lang->product->build = 'Build'; $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; +$lang->product->currentExecution = 'Aktuelle Iteration/Phase'; $lang->product->activeStories = 'Aktivierte [S]'; $lang->product->activeStoriesTitle = 'Active Stories'; $lang->product->changedStories = 'Geänderte [S]'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 170facba81..9997b7914e 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . ' List'; $lang->product->build = 'Build List'; $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; +$lang->product->currentExecution = 'Current iteration/phase'; $lang->product->activeStories = 'Active [S]'; $lang->product->activeStoriesTitle = 'Active Stories'; $lang->product->changedStories = 'Changed [S]'; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 28b9f79586..0877903ff9 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -47,6 +47,7 @@ $lang->product->project = ' Liste ' . $lang->projectCommon; $lang->product->build = 'Liste Builds'; $lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous."; +$lang->product->currentExecution = 'Current iteration/phase'; $lang->product->activeStories = 'Actives [S]'; $lang->product->activeStoriesTitle = 'Stories Actives'; $lang->product->changedStories = 'Changées [S]'; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index 6bc26400a9..7a5903874a 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -47,6 +47,7 @@ $lang->product->project = 'Danh sách '.$lang->projectCommon; $lang->product->build = 'Danh sách bản dựng'; $lang->product->projectInfo = "{$lang->projectCommon} đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới."; +$lang->product->currentExecution = 'Chế độ lặp hiện thời'; $lang->product->activeStories = 'Kích hoạt [S]'; $lang->product->activeStoriesTitle = 'Kích hoạt câu chuyện'; $lang->product->changedStories = 'Đã thay đổi [S]'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index b16f6384f2..306a152c66 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; $lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}"; +$lang->product->currentExecution = '当前迭代/阶段'; $lang->product->activeStories = "激活{$lang->productSRCommon}"; $lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}"; $lang->product->changedStories = "已变更{$lang->productSRCommon}"; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index 326a9d3caf..30b6a568ca 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; $lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}"; +$lang->product->currentExecution = '當前迭代/階段'; $lang->product->activeStories = "激活{$lang->productSRCommon}"; $lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}"; $lang->product->changedStories = "已變更{$lang->productSRCommon}"; diff --git a/module/story/config.php b/module/story/config.php index bf40278686..fceedf5436 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -62,7 +62,7 @@ $config->story->datatable->fieldList['pri']['required'] = 'no'; $config->story->datatable->fieldList['title']['title'] = 'title'; $config->story->datatable->fieldList['title']['fixed'] = 'left'; -$config->story->datatable->fieldList['title']['width'] = 'auto'; +$config->story->datatable->fieldList['title']['width'] = '170'; $config->story->datatable->fieldList['title']['required'] = 'yes'; $config->story->datatable->fieldList['branch']['title'] = 'branch'; @@ -97,7 +97,7 @@ $config->story->datatable->fieldList['status']['required'] = 'no'; $config->story->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->story->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->story->datatable->fieldList['estimate']['width'] = '65'; +$config->story->datatable->fieldList['estimate']['width'] = '60'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index a420ac6498..02d76157e4 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -145,8 +145,8 @@ $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '删除'; $lang->user->personalData['createdTodos'] = '创建的待办数'; -$lang->user->personalData['createdRequirements'] = "创建的{$lang->URCommon}数"; -$lang->user->personalData['createdStories'] = "创建的{$lang->SRCommon}数"; +$lang->user->personalData['createdRequirements'] = "创建的用需/史诗数"; +$lang->user->personalData['createdStories'] = "创建的软需/故事数"; $lang->user->personalData['finishedTasks'] = '完成的任务数'; $lang->user->personalData['createdBugs'] = '提交的Bug数'; $lang->user->personalData['resolvedBugs'] = '解决的Bug数';