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

Merge branch 'mayue_fix_bug_#18310' into 'master'

Browse Source 
* Fix bug #18310.

See merge request easycorp/zentaopms!2567
This commit is contained in:
李玉春
2022-03-28 08:55:16 +00:00
parent 38f92da961 1a7d18a377
commit b87ce16ef3
6 changed files with 13 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/control.php
+1 -1
View File
@@ -105,7 +105,7 @@ class projectrelease extends control
if(!empty($_POST))
{
$releaseID = $this->projectrelease->create($projectID);
$releaseID = $this->release->create(0, 0, $projectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('release', $releaseID, 'opened');
module/projectrelease/js/create.js
+2 -1
View File
@@ -3,7 +3,8 @@ $('#submit').click(function()
var dateFormat = new RegExp(/^\d{4}\-\d{2}\-\d{2}$/);
var name = $('#name').val();
var date = $('#date').val();
if(name && dateFormat.test(date))
var build = $('#build').val();
if(name && build && dateFormat.test(date))
{
var result = confirm(confirmLink) ? true : false;
$('#sync').val(result);
module/projectrelease/model.php
-137
View File
@@ -95,143 +95,6 @@ class projectreleaseModel extends model
return array_keys($releases);
}
/**
* Create a release.
*
* @access public
* @return int
*/
public function create($projectID = 0)
{
/* Init vars. */
$productID = $this->post->product;
$branch = $this->post->branch;
$buildID = 0;
$projectID = $projectID ? $projectID : $this->session->project;
/* Check build if build is required. */
if(strpos($this->config->release->create->requiredFields, 'build') !== false and $this->post->build == false) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->release->build);
/* Check date must be not more than today. */
if($this->post->date > date('Y-m-d')) return dao::$errors[] = $this->lang->release->errorDate;
if($this->post->build)
{
$build = $this->loadModel('build')->getByID($this->post->build);
$productID = $build->product;
$branch = $build->branch;
}
$release = fixer::input('post')
->add('project', $projectID)
->add('product', (int)$productID)
->add('branch', (int)$branch)
->setDefault('stories', '')
->join('stories', ',')
->join('bugs', ',')
->join('mailto', ',')
->setIF($this->post->build == false, 'build', $buildID)
->setIF($productID, 'product', $productID)
->setIF($branch, 'branch', $branch)
->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags)
->remove('allchecker,files,labels,uid,sync')
->get();
/* Auto create build when release is not link build. */
if(empty($release->build) and $release->name)
{
$build = $this->dao->select('*')->from(TABLE_BUILD)
->where('deleted')->eq('0')
->andWhere('name')->eq($release->name)
->andWhere('product')->eq($productID)
->andWhere('branch')->eq($branch)
->fetch();
if($build)
{
return dao::$errors['build'] = sprintf($this->lang->release->existBuild, $release->name);
}
else
{
$build = new stdclass();
$build->project = $projectID;
$build->product = (int)$productID;
$build->branch = (int)$branch;
$build->name = $release->name;
$build->date = $release->date;
$build->builder = $this->app->user->account;
$build->desc = $release->desc;
$build->execution = 0;
$build = $this->loadModel('file')->processImgURL($build, $this->config->release->editor->create['id']);
$this->dao->insert(TABLE_BUILD)->data($build)
->autoCheck()
->check('name', 'unique', "product = '{$productID}' AND branch = '{$branch}' AND deleted = '0'")
->batchCheck('name', 'notempty')
->exec();
if(dao::isError()) return false;
$buildID = $this->dao->lastInsertID();
$release->build = $buildID;
}
}
if($release->build)
{
$buildInfo = $this->dao->select('branch, stories, bugs')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
$release->branch = $buildInfo->branch;
if($this->post->sync == 'true')
{
$release->stories = $buildInfo->stories;
$release->bugs = $buildInfo->bugs;
}
}
$release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid);
$this->dao->insert(TABLE_RELEASE)->data($release)
->autoCheck()
->batchCheck($this->config->release->create->requiredFields, 'notempty')
->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'");
if(dao::isError())
{
if(!empty($buildID)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($buildID)->exec();
return false;
}
$this->dao->exec();
if(dao::isError())
{
if(!empty($buildID)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($buildID)->exec();
}
else
{
$releaseID = $this->dao->lastInsertID();
$this->file->updateObjectID($this->post->uid, $releaseID, 'release');
$this->file->saveUpload('release', $releaseID);
$this->loadModel('score')->create('release', 'create', $releaseID);
/* Set stage to released. */
if($release->stories)
{
$this->loadModel('story');
$this->loadModel('action');
$storyIDList = array_filter(explode(',', $release->stories));
foreach($storyIDList as $storyID)
{
$this->story->setStage($storyID);
$this->action->create('story', $storyID, 'linked2release', '', $releaseID);
}
}
return $releaseID;
}
return false;
}
/**
* Update a release.
*
module/release/js/create.js
+2 -1
View File
@@ -3,7 +3,8 @@ $('#submit').click(function()
var dateFormat = new RegExp(/^\d{4}\-\d{2}\-\d{2}$/);
var name = $('#name').val();
var date = $('#date').val();
if(name && dateFormat.test(date))
var build = $('#build').val();
if(name && build && dateFormat.test(date))
{
var result = confirm(confirmLink) ? true : false;
$('#sync').val(result);
module/release/lang/zh-cn.php
+1 -1
View File
@@ -24,7 +24,7 @@ $lang->release->batchUnlinkStory = "批量移除{$lang->SRCommon}";
$lang->release->batchUnlinkBug = "批量移除Bug";
$lang->release->confirmDelete = "您确认删除该发布吗？";
$lang->release->confirmLink = "是否将版本中完成的{$lang->SRCommon}和已解决的bug关联到发布下？";
$lang->release->confirmLink = "是否将版本中完成的{$lang->SRCommon}和已解决的Bug关联到发布下？";
$lang->release->confirmUnlinkStory = "您确认移除该{$lang->SRCommon}吗？";
$lang->release->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->release->existBuild = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
module/release/model.php
+7 -5
View File
@@ -108,15 +108,15 @@ class releaseModel extends model
*
* @param int $productID
* @param int $branch
* @param int $projectID
* @access public
* @return int
*/
public function create($productID, $branch = 0)
public function create($productID = 0, $branch = 0, $projectID = 0)
{
/* Init vars. */
$productID = (int)$productID;
$branch = (int)$branch;
$buildID = 0;
$productID = $this->post->product ? $this->post->product : (int)$productID;
$branch = $this->post->branch ? $this->post->branch : (int)$branch;
/* Check build if build is required. */
if(strpos($this->config->release->create->requiredFields, 'build') !== false and $this->post->build == false) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->release->build);
@@ -127,11 +127,12 @@ class releaseModel extends model
$release = fixer::input('post')
->add('product', (int)$productID)
->add('branch', (int)$branch)
->setIF($projectID, 'project', $projectID)
->setIF($this->post->build == false, 'build', 0)
->setDefault('stories', '')
->join('stories', ',')
->join('bugs', ',')
->join('mailto', ',')
->setIF($this->post->build == false, 'build', $buildID)
->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags)
->remove('allchecker,files,labels,uid,sync')
->get();
@@ -152,6 +153,7 @@ class releaseModel extends model
else
{
$build = new stdclass();
$build->project = $projectID;
$build->product = (int)$productID;
$build->branch = (int)$branch;
$build->name = $release->name;