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

* Fix bug #16477和#16485

Browse Source
This commit is contained in:
wangjianhua
2021-11-19 08:31:58 +00:00
parent 94f44c39c8
commit fa32609ca0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
+3 -2
View File
@@ -485,10 +485,11 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<?php
foreach($plans as $planID => $plan)
{
$planTitle = strip_tags($plan);
$position = stripos($plan, '/');
$planLabel = $position === false ? $plan : ('<span class="label label-outline label-badge">' . substr($plan, 0, $position) . '</span>' . substr($plan, $position + 1));
$searchKey = $withSearch ? ('data-key="' . zget($plansPinYin, $plan, '') . '"') : '';
$actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
echo html::a('#', $plan, '', "$searchKey title='{$planTitle}' onclick=\"setFormAction('$actionLink', 'hiddenwin', '#productStoryForm')\"");
echo html::a('#', $planLabel, '', "$searchKey title='{$plan}' onclick=\"setFormAction('$actionLink', 'hiddenwin', '#productStoryForm')\"");
}
?>
</div>
module/productplan/model.php
+2 -1
View File
@@ -214,8 +214,9 @@ class productplanModel extends model
{
if($plan->parent == '-1') $parentTitle[$plan->id] = $plan->title;
if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title;
$planPairs[$plan->id] = '<span class="label label-outline label-badge">' . ($plan->branchName ? $plan->branchName : $this->lang->branch->main) . '</span> ' . $plan->title . " [{$plan->begin} ~ {$plan->end}]";
$planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
$planPairs[$plan->id] = ($plan->branchName ? $plan->branchName : $this->lang->branch->main) . ' / ' . $planPairs[$plan->id];
}
return array('' => '') + $planPairs;
}