Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug.

Browse Source
This commit is contained in:
sunguangming
2024-03-04 13:02:42 +08:00
parent 54bf6c2f10
commit 782555645c
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/epic/model.php
+6 -1
View File
@@ -1,5 +1,10 @@
<?php
class epicModel extends model
{
public static function isClickable(object $data, string $action): bool
{
global $app;
$app->control->loadModel('story');
return call_user_func_array(array('storyModel', 'isClickable'), array($data, $action));
}
}
module/product/ui/browse.html.php
+2 -5
View File
@@ -190,11 +190,6 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
foreach($stories as $story)
{
$story->rawModule = $story->module;
$story->status = zget($lang->{$storyType}->statusList, $story->status, '');
$story->pri = zget($lang->{$storyType}->priList, $story->pri, '');
$story->source = zget($lang->{$storyType}->sourceList, $story->source, '');
$story->category = zget($lang->{$storyType}->categoryList, $story->category, '');
$story->closedReason = zget($lang->{$storyType}->reasonList, $story->closedReason, '');
$options['branches'] = zget($branchOptions, $story->product, array());
$data[] = $this->story->formatStoryForList($story, $options, $storyType);
if(!isset($story->children)) continue;
@@ -205,6 +200,8 @@ foreach($stories as $story)
$child->rawModule = $child->module;
$data[] = $this->story->formatStoryForList($child, $options, $storyType);
}
$story->status = zget($lang->{$storyType}->statusList, $story->status, '');
}
/* Generate toolbar of DataTable footer. */
module/requirement/model.php
+6 -1
View File
@@ -1,5 +1,10 @@
<?php
class requirementModel extends model
{
public static function isClickable(object $data, string $action): bool
{
global $app;
$app->control->loadModel('story');
return call_user_func_array(array('storyModel', 'isClickable'), array($data, $action));
}
}
module/story/model.php
+4 -3
View File
@@ -4416,9 +4416,10 @@ class storyModel extends model
$story->branch = zget(zget($options, 'branches', array()), $story->branch, '');
$story->plan = isset($story->planTitle) ? $story->planTitle : zget(zget($options, 'plans', array()), $story->plan, '');
$story->source = zget($this->lang->story->sourceList, $story->source, '');
$story->category = zget($this->lang->story->categoryList, $story->category);
$story->closedReason = zget($this->lang->story->reasonList, $story->closedReason);
$story->pri = zget($this->lang->{$storyType}->priList, $story->pri, '');
$story->source = zget($this->lang->{$storyType}->sourceList, $story->source, '');
$story->category = zget($this->lang->{$storyType}->categoryList, $story->category);
$story->closedReason = zget($this->lang->{$storyType}->reasonList, $story->closedReason);
/* Set rowKey to uniqueID in dTable. */
$story->uniqueID = $story->parent > 0 ? $story->parent . '-' . $story->id : $story->id;