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

* Fix bug #33143.

Browse Source
This commit is contained in:
liumengyi
2023-04-18 15:08:23 +08:00
parent a3648f0ec5
commit 62d73d2149
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+20 -15
View File
@@ -333,21 +333,23 @@ class story extends control
if($storyID > 0)
{
$story = $this->story->getByID($storyID);
$planID = $story->plan;
$source = $story->source;
$sourceNote = $story->sourceNote;
$color = $story->color;
$pri = $story->pri;
$productID = $story->product;
$moduleID = $story->module;
$estimate = $story->estimate;
$title = $story->title;
$spec = htmlSpecialString($story->spec);
$verify = htmlSpecialString($story->verify);
$keywords = $story->keywords;
$mailto = $story->mailto;
$category = $story->category;
$story = $this->story->getByID($storyID);
$planID = $story->plan;
$source = $story->source;
$sourceNote = $story->sourceNote;
$color = $story->color;
$pri = $story->pri;
$productID = $story->product;
$moduleID = $story->module;
$estimate = $story->estimate;
$title = $story->title;
$spec = htmlSpecialString($story->spec);
$verify = htmlSpecialString($story->verify);
$keywords = $story->keywords;
$mailto = $story->mailto;
$category = $story->category;
$feedbackBy = $story->feedbackBy;
$notifyEmail = $story->notifyEmail;
}
if($bugID > 0)
@@ -483,6 +485,9 @@ class story extends control
$this->view->needReview = ($this->app->user->account == $product->PO or $objectID > 0 or $this->config->story->needReview == 0 or !$this->story->checkForceReview()) ? "checked='checked'" : "";
$this->view->type = $storyType;
$this->view->category = !empty($category) ? $category : 'feature';
$this->view->feedbackBy = !empty($feedbackBy) ? $feedbackBy : '';
$this->view->notifyEmail = !empty($notifyEmail) ? $notifyEmail : '';
$this->view->showFeedbackBox = in_array($source, $this->config->story->feedbackSource);
$this->display();
}
module/story/view/create.html.php
+6 -6
View File
@@ -163,22 +163,22 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
<?php endif;?>
<tr class='sourceBox <?php echo $hiddenSource;?>'>
<th><?php echo $lang->story->source;?></th>
<td colspan='2'>
<td colspan='<?php echo $showFeedbackBox ? 1 : 2;?>'>
<?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
</td>
<td colspan="2" class="sourceTd">
<td colspan="<?php echo $showFeedbackBox ? 1 : 2;?>" class="sourceTd">
<div class="input-group">
<div class='input-group-addon' id='sourceNoteBox'><?php echo $lang->story->sourceNote;?></div>
<?php echo html::input('sourceNote', $sourceNote, "class='form-control'");?>
</div>
</td>
<td colspan="2" id='feedbackBox' class='hidden'>
<td colspan="2" id='feedbackBox' class='<?php if(!$showFeedbackBox) echo 'hidden';?>'>
<div class="input-group">
<div class="input-group">
<div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->feedbackBy;?></div>
<?php echo html::input('feedbackBy', '', "class='form-control'");?>
<?php echo html::input('feedbackBy', $feedbackBy, "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->story->notifyEmail;?></span>
<?php echo html::input('notifyEmail', '', "class='form-control'");?>
<?php echo html::input('notifyEmail', $notifyEmail, "class='form-control'");?>
</div>
</div>
</td>
@@ -189,7 +189,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
<td colspan='2' id='assignedToBox'>
<?php echo html::select('assignedTo', $hiddenProduct ? $teamUsers : $users, '', "class='form-control picker-select'");?>
</td>
<td colspan="2" class="sourceTd <?php echo $hiddenSource?> sourceBox">
<td colspan="<?php echo $showFeedbackBox ? 1 : 2;?>" class="sourceTd <?php echo $hiddenSource?> sourceBox">
<div class="input-group">
<div class="input-group">
<div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>