* Finish task #46098.
This commit is contained in:
@@ -73,6 +73,7 @@ class release extends control
|
||||
|
||||
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $releaseID));
|
||||
if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProductBuilds($productID)"));
|
||||
|
||||
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ $lang->release->batchUnlinkStory = "Batch Unlink Stories";
|
||||
$lang->release->batchUnlinkBug = "Batch Unlink Bugs";
|
||||
|
||||
$lang->release->confirmDelete = "Do you want to delete this release?";
|
||||
$lang->release->confirmLink = "Whether to link the stories completed in the version and the bugs solved to the release?";
|
||||
$lang->release->confirmUnlinkStory = "Do you want to remove this story?";
|
||||
$lang->release->confirmUnlinkBug = "Do you want to remove this bug?";
|
||||
$lang->release->existBuild = '『Build』『%s』existed. You could change『name』or choose a『build』.';
|
||||
|
||||
@@ -24,6 +24,7 @@ $lang->release->batchUnlinkStory = "批量移除{$lang->SRCommon}";
|
||||
$lang->release->batchUnlinkBug = "批量移除Bug";
|
||||
|
||||
$lang->release->confirmDelete = "您确认删除该发布吗?";
|
||||
$lang->release->confirmLink = "是否将版本中完成的{$lang->SRCommon}和已解决的bug关联到发布下?";
|
||||
$lang->release->confirmUnlinkStory = "您确认移除该{$lang->SRCommon}吗?";
|
||||
$lang->release->confirmUnlinkBug = "您确认移除该Bug吗?";
|
||||
$lang->release->existBuild = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
|
||||
|
||||
@@ -174,9 +174,14 @@ class releaseModel extends model
|
||||
|
||||
if($release->build)
|
||||
{
|
||||
$buildInfo = $this->dao->select('project, branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
|
||||
$buildInfo = $this->dao->select('project, branch, stories, bugs')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
|
||||
$release->branch = $buildInfo->branch;
|
||||
$release->project = $buildInfo->project;
|
||||
if($release->sync)
|
||||
{
|
||||
$release->stories = $buildInfo->stories;
|
||||
$release->bugs = $buildInfo->bugs;
|
||||
}
|
||||
}
|
||||
|
||||
$release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid);
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/kindeditor.html.php';?>
|
||||
<?php js::set('confirmLink', $lang->release->confirmLink);?>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='center-block'>
|
||||
<div class='main-header'>
|
||||
@@ -64,6 +65,7 @@
|
||||
<tr>
|
||||
<td colspan='3' class='text-center form-actions'>
|
||||
<?php echo html::submitButton();?>
|
||||
<?php echo html::hidden('sync', 'false');?>
|
||||
<?php echo html::backButton();?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -170,10 +170,10 @@ class storyModel extends model
|
||||
public function getRequierements($productID)
|
||||
{
|
||||
return $this->dao->select('id,title')->from(TABLE_STORY)
|
||||
->where('deleted')->eq(0)
|
||||
->andWhere('product')->eq($productID)
|
||||
->andWhere('type')->eq('requirement')
|
||||
->andWhere('status')->notIN('draft,closed')
|
||||
->where('deleted')->eq(0)
|
||||
->fetchPairs();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user