From 2cf53afcebfe071fb72afc45238b4f3748253f3f Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Tue, 12 Sep 2017 14:14:36 +0800 Subject: [PATCH] * Finish task #3216. --- module/product/model.php | 8 ++++---- module/story/config.php | 5 +++++ module/story/model.php | 17 ++++++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index 2fdc6fc19a..c6c579931d 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -655,11 +655,11 @@ class productModel extends model /** * Get product stats. - * - * @param string $orderBy - * @param int $pager + * + * @param string $orderBy + * @param int $pager * @access public - * @return array + * @return array */ public function getStats($orderBy = 'order_desc', $pager = null, $status = 'noclosed') { diff --git a/module/story/config.php b/module/story/config.php index 115e3a0cf6..04152e193c 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -74,6 +74,11 @@ $config->story->datatable->fieldList['source']['fixed'] = 'no'; $config->story->datatable->fieldList['source']['width'] = '90'; $config->story->datatable->fieldList['source']['required'] = 'no'; +$config->story->datatable->fieldList['sourceNote']['title'] = 'sourceNote'; +$config->story->datatable->fieldList['sourceNote']['fixed'] = 'no'; +$config->story->datatable->fieldList['sourceNote']['width'] = '90'; +$config->story->datatable->fieldList['sourceNote']['required'] = 'no'; + $config->story->datatable->fieldList['status']['title'] = 'statusAB'; $config->story->datatable->fieldList['status']['fixed'] = 'no'; $config->story->datatable->fieldList['status']['width'] = '80'; diff --git a/module/story/model.php b/module/story/model.php index b8a97e59d3..601c73318d 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2234,12 +2234,12 @@ class storyModel extends model /** * Print cell data - * - * @param object $col - * @param object $story - * @param array $users - * @param array $branches - * @param array $storyStages + * + * @param object $col + * @param object $story + * @param array $users + * @param array $branches + * @param array $storyStages * @param array $modulePairs * @param array $storyTasks * @param array $storyBugs @@ -2259,7 +2259,7 @@ class storyModel extends model if($id == 'title') $class .= ' text-left'; if($id == 'assignedTo' && $story->assignedTo == $account) $class .= ' red'; - $title = ''; + $title = ''; if($id == 'title') $title = $story->title; if($id == 'plan') $title = $story->planTitle; @@ -2288,6 +2288,9 @@ class storyModel extends model case 'source': echo zget($this->lang->story->sourceList, $story->source, $story->source); break; + case 'sourceNote': + echo $story->sourceNote; + break; case 'status': echo $this->lang->story->statusList[$story->status]; break;