* Fix bug #23269.
This commit is contained in:
@@ -27,6 +27,11 @@ $(function()
|
||||
}
|
||||
})
|
||||
|
||||
$('#reviewItem ~ ul > li').on('click', function()
|
||||
{
|
||||
if(storyString !== '') alert(reviewStory);
|
||||
});
|
||||
|
||||
$(document).on('click', '.story-toggle', function(e)
|
||||
{
|
||||
var $toggle = $(this);
|
||||
|
||||
@@ -101,6 +101,7 @@ $lang->product->changeLineError = "Products already exist under the product
|
||||
$lang->product->programEmpty = 'Program should not be empty!';
|
||||
$lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!";
|
||||
$lang->product->nameIsDuplicated = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
|
||||
$lang->product->reviewStory = 'You are not a reviewer for needs " %s %s", and cannot review. This operation has been filtered';
|
||||
|
||||
$lang->product->id = 'ID';
|
||||
$lang->product->program = "Program";
|
||||
|
||||
@@ -101,6 +101,7 @@ $lang->product->changeLineError = "Products already exist under the product
|
||||
$lang->product->programEmpty = 'Program should not be empty!';
|
||||
$lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!";
|
||||
$lang->product->nameIsDuplicated = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
|
||||
$lang->product->reviewStory = 'You are not a reviewer for needs " %s %s", and cannot review. This operation has been filtered';
|
||||
|
||||
$lang->product->id = 'ID';
|
||||
$lang->product->program = "Program";
|
||||
|
||||
@@ -101,6 +101,7 @@ $lang->product->changeLineError = "Products already exist under the product
|
||||
$lang->product->programEmpty = 'Program should not be empty!';
|
||||
$lang->product->nameIsDuplicate = "『%s』 product line already exists, please reset!";
|
||||
$lang->product->nameIsDuplicated = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
|
||||
$lang->product->reviewStory = 'You are not a reviewer for needs " %s %s", and cannot review. This operation has been filtered';
|
||||
|
||||
$lang->product->id = 'ID';
|
||||
$lang->product->program = "Program";
|
||||
|
||||
@@ -101,6 +101,7 @@ $lang->product->changeLineError = "产品线下已有产品,不可修改
|
||||
$lang->product->programEmpty = '项目集不能为空';
|
||||
$lang->product->nameIsDuplicate = "『%s』产品线已经存在,请重新设置!";
|
||||
$lang->product->nameIsDuplicated = "产品线已经有『%s』这条记录了。如果您确定该记录已删除,请到后台-系统-数据-回收站还原。";
|
||||
$lang->product->reviewStory = '您不是研发需求"%s %s"的评审人,无法评审,本次操作已被过滤。';
|
||||
|
||||
$lang->product->id = '编号';
|
||||
$lang->product->program = "所属项目集";
|
||||
|
||||
@@ -401,10 +401,16 @@ js::set('vision', $this->config->vision);
|
||||
<div class="table-actions btn-toolbar">
|
||||
<div class='btn-group dropup'>
|
||||
<?php
|
||||
foreach($stories as $story) $storyProductIds[$story->product] = $story->product;
|
||||
$storyProductID = count($storyProductIds) > 1 ? 0 : $productID;
|
||||
$disabled = $canBatchEdit ? '' : "disabled='disabled'";
|
||||
$actionLink = $this->createLink('story', 'batchEdit', "productID=$storyProductID&projectID=$projectID&branch=$branch&storyType=$storyType");
|
||||
$storyString = '';
|
||||
foreach($stories as $story)
|
||||
{
|
||||
$storyProductIds[$story->product] = $story->product;
|
||||
if(!in_array($this->app->user->account, $story->reviewer)) $storyString .= $story->title . ',';
|
||||
}
|
||||
$reviewStoryTips = sprintf($lang->product->reviewStory, '', $storyString);
|
||||
$storyProductID = count($storyProductIds) > 1 ? 0 : $productID;
|
||||
$disabled = $canBatchEdit ? '' : "disabled='disabled'";
|
||||
$actionLink = $this->createLink('story', 'batchEdit', "productID=$storyProductID&projectID=$projectID&branch=$branch&storyType=$storyType");
|
||||
?>
|
||||
<?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch) echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
|
||||
<?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch):?>
|
||||
@@ -694,6 +700,10 @@ js::set('vision', $this->config->vision);
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
js::set('storyString', $storyString);
|
||||
js::set('reviewStory', $reviewStoryTips);
|
||||
?>
|
||||
<script>
|
||||
var moduleID = <?php echo $moduleID?>;
|
||||
var branchID = $.cookie('storyBranch');
|
||||
|
||||
Reference in New Issue
Block a user