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

* [bug#52302,done,1h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2024-07-06 15:49:44 +08:00
committed by 王怡栋
parent 4face9adc0
commit d1cd51871c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/ui/assigntomeblock.html.php
+10 -2
View File
@@ -98,8 +98,14 @@ foreach($hasViewPriv as $type => $bool)
$typeName = '';
if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
if($reviewType == 'story') $typeName = $review->storyType == 'story' ? $lang->SRCommon : $lang->URCommon;
if($review->type == 'projectreview') $typeName = $lang->project->common;
if($reviewType == 'story')
{
if($review->storyType == 'story') $typeName = $lang->SRCommon;
if($review->storyType == 'requirement') $typeName = $lang->URCommon;
if($review->storyType == 'epic') $typeName = $lang->ERCommon;
}
if($review->type == 'projectreview') $typeName = $lang->project->common;
if(in_array($reviewType, array('story', 'epic', 'requirement'))) $config->block->review->dtable->fieldList['title']['link']['method'] = 'storyView';
if(isset($lang->$reviewType->statusList)) $statusList = array_merge($statusList, $lang->$reviewType->statusList);
if($reviewType == 'attend') $statusList = array_merge($statusList, $lang->attend->reviewStatusList);
@@ -110,6 +116,8 @@ foreach($hasViewPriv as $type => $bool)
$config->block->review->dtable->fieldList['status']['statusMap'] = $statusList;
}
if($type == 'requirement') $config->block->story->dtable->fieldList['title']['title'] = str_replace($lang->story->story, $lang->story->requirement, $lang->story->title);
if($type == 'epic') $config->block->story->dtable->fieldList['title']['title'] = str_replace($lang->story->story, $lang->story->epic, $lang->story->title);
if(in_array($type, array('story', 'epic', 'requirement'))) $config->block->story->dtable->fieldList['title']['link']['module'] = $type;
if($type == 'ticket') $config->block->ticket->dtable->fieldList['product']['map'] = $products;
if($type == 'feedback') $config->block->feedback->dtable->fieldList['product']['map'] = $products;
if($type == 'meeting') $config->block->meeting->dtable->fieldList['dept']['map'] = $depts;
module/product/ui/browse.html.php
+2 -2
View File
@@ -226,7 +226,7 @@ foreach($stories as $story)
}
/* Generate toolbar of DataTable footer. */
$fnGenerateFootToolbar = function() use ($lang, $product, $productID, $project, $storyType, $browseType, $isProjectStory, $projectHasProduct, $storyProductID, $projectID, $branch, $users, $branchTagOption, $modules, $plans, $branchID, $gradePairs, $config,$noclosedRoadmaps)
$fnGenerateFootToolbar = function() use ($lang, $product, $productID, $project, $storyType, $browseType, $isProjectStory, $projectHasProduct, $storyProductID, $projectID, $branch, $users, $branchTagOption, $modules, $plans, $branchID, $gradePairs, $config,$noclosedRoadmaps, $gradeGroup)
{
/* Flag variables of permissions. */
$canBeChanged = common::canModify('product', $product);
@@ -251,7 +251,7 @@ $fnGenerateFootToolbar = function() use ($lang, $product, $productID, $project,
$canBatchChangeStage = $canBeChanged && hasPriv('story', 'batchChangeStage') && $storyType == 'story';
$canBatchChangeBranch = $canBeChanged && hasPriv($storyType, 'batchChangeBranch') && $product && $product->type != 'normal' && $productID;
$canBatchChangeModule = $canBeChanged && hasPriv($storyType, 'batchChangeModule') && $productID && (($product->type != 'normal' && $branchID != 'all') || $product->type == 'normal') && !$isProjectStory;
$canBatchChangeParent = $canBeChanged && hasPriv($storyType, 'batchChangeParent');
$canBatchChangeParent = $canBeChanged && hasPriv($storyType, 'batchChangeParent') && !($storyType == 'epic' && count($gradeGroup['epic']) < 2);
$canBatchUnlink = $canBeChanged && $projectHasProduct && hasPriv('projectstory', 'batchUnlinkStory');
$canBatchImportToLib = $canBeChanged && $isProjectStory && in_array($this->config->edition, array('max', 'ipd')) && hasPriv('story', 'batchImportToLib') && helper::hasFeature('storylib');
$canBatchChangeRoadmap = $canBeChanged && hasPriv('story', 'batchChangeRoadmap') && $config->vision == 'or' && $storyType == 'requirement';