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

* adjust code for bug #757.

Browse Source
This commit is contained in:
chenfeiCF
2015-11-02 15:50:47 +08:00
parent f82bd56ce2
commit a6b66e916e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/model.php
+2 -2
View File
@@ -177,7 +177,7 @@ class buildModel extends model
->remove('resolvedBy,allchecker,files,labels')
->get();
$this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->batchCheck($this->config->build->create->requiredFields, 'notempty')->check('name', 'unique', "product = {$build->product}")->exec();
$this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->batchCheck($this->config->build->create->requiredFields, 'notempty')->check('name', 'unique', "product = {$build->product} AND deleted = '0'")->exec();
if(!dao::isError())
{
$buildID = $this->dao->lastInsertID();
@@ -204,7 +204,7 @@ class buildModel extends model
->autoCheck()
->batchCheck($this->config->build->edit->requiredFields, 'notempty')
->where('id')->eq((int)$buildID)
->check('name','unique', "id != $buildID AND product = {$build->product}")
->check('name', 'unique', "id != $buildID AND product = {$build->product} AND deleted = '0'")
->exec();
if(!dao::isError()) return common::createChanges($oldBuild, $build);
}
module/release/model.php
+3 -3
View File
@@ -111,7 +111,7 @@ class releaseModel extends model
->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags)
->remove('build,files,labels')
->get();
$this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->check('name','unique', "deleted='0'")->exec();
$this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->check('name', 'unique', "product = {$build->product} AND deleted = '0'")->exec();
$buildID = $this->dao->lastInsertID();
}
@@ -125,7 +125,7 @@ class releaseModel extends model
->remove('allchecker,files,labels')
->get();
$this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique', "deleted='0'")->exec();
$this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name', 'unique', "product = {$release->product} AND deleted = '0'")->exec();
if(!dao::isError())
{
@@ -153,7 +153,7 @@ class releaseModel extends model
$this->dao->update(TABLE_RELEASE)->data($release)
->autoCheck()
->batchCheck($this->config->release->edit->requiredFields, 'notempty')
->check('name','unique', "id!=$releaseID and deleted='0'")
->check('name', 'unique', "id != $releaseID AND product = {$release->product} AND deleted = '0'")
->where('id')->eq((int)$releaseID)
->exec();
if(!dao::isError()) return common::createChanges($oldRelease, $release);