diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php index e9ffcd7e9c..01fec6c851 100644 --- a/extension/lite/my/ext/view/task.html.php +++ b/extension/lite/my/ext/view/task.html.php @@ -96,7 +96,7 @@ else { $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = ''); - echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'"); + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); } ?> children)) echo '';?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index bf56cc5a40..c33b36f579 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -45,7 +45,7 @@ id);?> task->priList, $task->pri, $task->pri)?> executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?> - createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-toggle='modal'")?> + createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width:80% data-toggle='modal'")?> estimate . $lang->execution->workHourUnit;?> deadline, 0, 4) > 0) echo $task->deadline;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 9fefc88fef..2b2c166bae 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -109,7 +109,7 @@ else { $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = ''); - echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'"); + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); } ?> children)) echo '';?> diff --git a/module/story/model.php b/module/story/model.php index da0410ff66..9a3cd9230b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3098,6 +3098,10 @@ class storyModel extends model $storyQuery = str_replace($allProduct, '1', $this->session->executionStoryQuery); } $storyQuery = preg_replace('/`(\w+)`/', 't2.`$1`', $storyQuery); + + /* Get productID*/ + $products = $this->loadModel('product')->getProducts($executionID); + if($products) $productID = key($products); /* From action Get reviews. */ $review = $this->dao->select('objectID')->from(TABLE_ACTION) ->where('product')->like("%,$productID,%") diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index 85369947b9..322435564a 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -62,7 +62,7 @@ team)) echo '' . $this->lang->task->multipleAB . ' ';?> parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?> executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?> - createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'");?> + createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'");?> estimate . $lang->execution->workHourUnit;?> consumed . $lang->execution->workHourUnit;?>