From a6b66e916e11b97d9f5af47133ddc83a67b7b844 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 2 Nov 2015 15:50:47 +0800
Subject: [PATCH] * adjust code for bug #757.

---
 module/build/model.php   | 4 ++--
 module/release/model.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index a229515afc..bdc2c0de03 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -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);
     }
diff --git a/module/release/model.php b/module/release/model.php
index e45aba9382..394d15518a 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -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);