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

* Fix bug #37923.

Browse Source
This commit is contained in:
wangyidong
2023-08-31 09:06:49 +08:00
parent b37b98a84f
commit 94680fe462
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.fix.html.php
+1
View File
@@ -6,6 +6,7 @@
<?php
$showSwitchLink = true;
if($currentModule == 'product' && $currentMethod == 'browse') $showSwitchLink = false;
if($currentModule == 'projectstory' && $currentMethod == 'story') $showSwitchLink = false;
if($currentModule == 'project' && $currentMethod == 'bug') $showSwitchLink = false;
if($currentModule == 'execution' && strpos(',all,task,bug,', ",{$currentMethod},") !== false) $showSwitchLink = false;
if($currentModule == 'bug' && $currentMethod == 'browse') $showSwitchLink = false;
module/story/config.php
+1 -1
View File
@@ -59,7 +59,7 @@ $config->story->datatable->defaultField = array('id', 'title', 'pri', 'plan', 's
$config->story->datatable->fieldList['id']['title'] = 'idAB';
$config->story->datatable->fieldList['id']['fixed'] = 'left';
$config->story->datatable->fieldList['id']['width'] = '70';
$config->story->datatable->fieldList['id']['width'] = '90';
$config->story->datatable->fieldList['id']['required'] = 'yes';
$config->story->datatable->fieldList['id']['type'] = 'checkID';
$config->story->datatable->fieldList['id']['sortType'] = true;
module/story/model.php
+5 -5
View File
@@ -4804,7 +4804,7 @@ class storyModel extends model
if(strpos('draft,changing', $story->status) !== false)
{
if($canSubmitReview) $menu .= common::printIcon('story', 'submitReview', "storyID=$story->id&from=story", $story, 'list', 'confirm', '', 'iframe', true, "data-width='50%'");
if($canSubmitReview) $menu .= common::buildIconButton('story', 'submitReview', "storyID=$story->id&from=story", $story, 'list', 'confirm', '', 'iframe', true, "data-width='50%'");
}
else
{
@@ -4812,7 +4812,7 @@ class storyModel extends model
{
$reviewDisabled = in_array($this->app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changing') ? '' : 'disabled';
$story->from = 'execution';
$menu .= common::printIcon('story', 'review', "story={$story->id}&from=execution", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
$menu .= common::buildIconButton('story', 'review', "story={$story->id}&from=execution", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
}
}
@@ -4820,7 +4820,7 @@ class storyModel extends model
{
$recallDisabled = empty($story->reviewedBy) and strpos('draft,changing', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled';
$title = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
$menu .= common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $title);
$menu .= common::buildIconButton('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $title);
}
$this->lang->task->create = $this->lang->execution->wbs;
@@ -4832,11 +4832,11 @@ class storyModel extends model
}
else
{
if($hasDBPriv and $storyType == 'story') $menu .= common::printIcon('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
if($hasDBPriv and $storyType == 'story') $menu .= common::buildIconButton('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
}
$this->lang->task->batchCreate = $this->lang->execution->batchWBS;
if($hasDBPriv and $storyType == 'story') $menu .= common::printIcon('task', 'batchCreate', "executionID=$executionID&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
if($hasDBPriv and $storyType == 'story') $menu .= common::buildIconButton('task', 'batchCreate', "executionID=$executionID&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
if(($canSubmitReview or $canReview or $canRecall or $canCreateTask or $canBatchCreateTask) and ($canCreateCase or $canEstimate or $canUnlinkStory))
{