From f82bd56ce25c027d07005ee60c762a0c2f22954b Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 2 Nov 2015 14:35:35 +0800
Subject: [PATCH] * fix bug #757.

---
 db/update7.3.sql         | 2 ++
 module/release/model.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/db/update7.3.sql b/db/update7.3.sql
index 3e6a25bfe0..d0bb6df09b 100644
--- a/db/update7.3.sql
+++ b/db/update7.3.sql
@@ -26,3 +26,5 @@ CREATE TABLE `zt_storystage` (
 ALTER TABLE `zt_story` ADD INDEX `product` (`product`, `module`, `type`, `pri`), DROP INDEX `product`;
 ALTER TABLE `zt_story` ADD `plan` text COLLATE 'utf8_general_ci' NOT NULL AFTER `module`;
 UPDATE `zt_story` SET `plan`='' WHERE `plan`='0';
+
+LTER TABLE `zt_release` DROP INDEX `name`;
diff --git a/module/release/model.php b/module/release/model.php
index a32e35d39b..e45aba9382 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')->exec();
+            $this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->check('name','unique', "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')->exec();
+        $this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique', "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")
+            ->check('name','unique', "id!=$releaseID and deleted='0'")
             ->where('id')->eq((int)$releaseID)
             ->exec();
         if(!dao::isError()) return common::createChanges($oldRelease, $release);