* finish task #38705.

This commit is contained in:
wangyidong
2021-06-22 11:36:26 +08:00
parent d90c25c7f7
commit 74f01e94bb
3 changed files with 4 additions and 10 deletions
+1 -1
View File
@@ -1612,7 +1612,7 @@ class story extends control
/* Change for requirement story title. */
if($story->type == 'story')
{
{
$this->lang->story->title = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
$this->lang->story->create = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->create);
$this->config->product->search['fields']['title'] = $this->lang->story->title;
+1 -1
View File
@@ -1747,7 +1747,7 @@ class storyModel extends model
->andWhere('t2.deleted')->eq(0)
->fetchPairs('project', 'branch');
$hasBranch = ($product->type != 'normal' and empty($story->branch));
$hasBranch = ($product and $product->type != 'normal' and empty($story->branch));
$stages = array();
if($hasBranch and $story->plan)
{
+2 -8
View File
@@ -100,16 +100,11 @@ foreach(explode(',', $showFields) as $field)
<td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>'>
<?php echo html::select("plans[$storyID]", $productPlans, $story->plan, "class='form-control chosen'");?>
</td>
<!-- <td title='<?php echo $story->title?>'>
<div class='input-group'>
<?php echo html::hidden("colors[$storyID]", $story->color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->story->colorTag}' data-update-text='#titles\\[{$storyID}\\]'");?>
<?php echo html::input("titles[$storyID]", $story->title, "class='form-control'"); ?>
</div>
</td> -->
<td title='<?php echo $story->title?>'>
<div class="input-group">
<div class="input-control has-icon-right">
<?php echo html::input("titles[$storyID]", $story->title, "class='form-control input-story-title' disabled"); ?>
<?php echo html::input("", $story->title, "class='form-control input-story-title' disabled"); ?>
<?php echo html::hidden("titles[$storyID]", $story->title); ?>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
@@ -117,7 +112,6 @@ foreach(explode(',', $showFields) as $field)
<li class="heading"><?php echo $lang->story->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<?php echo html::hidden("colors[$storyID]", $story->color, "class='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->story->colorTag}' data-update-color='#titles\\[{$storyID}\\]'");?>
<!-- <input type="hidden" class="colorpicker" id="color$id" name="color[$id]" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title$id"> -->
</div>
</div>
</div>