+ add the feature of deleted.

2010-04-12 06:24:47 +00:00
parent 67e31f9bd4
commit b6aae04c95
3 changed files with 55 additions and 28 deletions
@@ -178,8 +178,10 @@ class story extends control
    public function view($storyID, $version = 0)
    {
        $this->loadModel('action');
-        $storyID      = (int)$storyID;
-        $story        = $this->story->getById($storyID, $version);
+        $storyID = (int)$storyID;
+        $story   = $this->story->getById($storyID, $version);
+        if(!$story) die(js::error($this->lang->notFound) . js::locate('back'));
+
        $story->files = $this->loadModel('file')->getByObject('story', $storyID);
        $product      = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fields('name, id')->fetch();
        $plan         = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fetch('title');
@@ -215,10 +217,8 @@ class story extends control
        }
        else
        {
-            $story = $this->story->getById($storyID);
-            $this->story->delete($storyID);
-            echo js::locate($this->createLink('product', 'browse', "productID=$story->product"), 'parent');
-            exit;
+            $this->story->delete(TABLE_STORY, $storyID);
+            die(js::locate($this->session->storyList, 'parent'));
        }
    }

@@ -78,10 +78,13 @@ class storyModel extends model
        }

        /* 获得影响的Bug。*/
-        $story->bugs = $this->dao->findByStory($story->id)->from(TABLE_BUG)->andWhere('status')->ne('closed')->orderBy('id desc')->fetchAll();
+        $story->bugs = $this->dao->findByStory($story->id)->from(TABLE_BUG)
+            ->andWhere('status')->ne('closed')
+            ->andWhere('deleted')->eq(0)
+            ->orderBy('id desc')->fetchAll();

        /* 获得影响的用例。*/
-        $story->cases = $this->dao->findByStory($story->id)->from(TABLE_CASE)->fetchAll();
+        $story->cases = $this->dao->findByStory($story->id)->from(TABLE_CASE)->andWhere('deleted')->eq(0)->fetchAll();

        return $story;
    }
@@ -204,12 +207,6 @@ class storyModel extends model
        if(!dao::isError()) return common::createChanges($oldStory, $story);
    }
    
-    /* 删除一条需求。*/
-    public function delete($storyID)
-    {
-        $this->dao->delete()->from(TABLE_STORY)->where('id')->eq((int)$storyID)->limit(1)->exec();
-    }
-
    /* 评审需求。*/
    public function review($storyID)
    {
@@ -319,6 +316,7 @@ class storyModel extends model
            ->from(TABLE_PROJECTSTORY)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
            ->where('t1.story')->eq((int)$storyID)
            ->andWhere('t2.status')->eq('doing')
+            ->andWhere('t2.deleted')->eq(0)
            ->fetchPairs();

        /* 如果没有项目，但有计划，则阶段为planned或wait。*/
@@ -329,7 +327,12 @@ class storyModel extends model
            return;
        }
        /* 查找对应的任务。*/
-        $tasks = $this->dao->select('type,status')->from(TABLE_TASK)->where('project')->in($projects)->andWhere('story')->eq($storyID)->andWhere('status')->ne('cancel')->fetchGroup('type');
+        $tasks = $this->dao->select('type,status')->from(TABLE_TASK)
+            ->where('project')->in($projects)
+            ->andWhere('story')->eq($storyID)
+            ->andWhere('status')->ne('cancel')
+            ->andWhere('deleted')->eq(0)
+            ->fetchGroup('type');

        /* 没有任务，则所处阶段为'已经立项'。*/
        if(!$tasks)
@@ -379,6 +382,7 @@ class storyModel extends model
            ->where('t1.product')->in($productID)
            ->onCaseOf(!empty($moduleIds))->andWhere('module')->in($moduleIds)->endCase() 
            ->onCaseOf($status != 'all')->andWhere('status')->in($status)->endCase()
+            ->andWhere('t1.deleted')->eq(0)
            ->orderBy($orderBy)->page($pager)->fetchAll();
    }

@@ -391,6 +395,7 @@ class storyModel extends model
            ->onCaseOf($productID)->andWhere('t1.product')->in($productID)->endCase()
            ->onCaseOf($moduleIds)->andWhere('t1.module')->in($moduleIds)->endCase()
            ->onCaseOf($status != 'all')->andWhere('status')->in($status)->endCase()
+            ->andWhere('t1.deleted')->eq(0)
            ->orderBy($order)
            ->fetchAll();
        if(!$stories) return array();
@@ -400,7 +405,12 @@ class storyModel extends model
    /* 按照某一个查询条件获取列表。*/
    public function getByQuery($productID, $query, $orderBy, $pager = null)
    {
-        $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->where($query)->andWhere('product')->eq((int)$productID)->orderBy($orderBy)->page($pager)->fetchGroup('plan');
+        $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->where($query)
+            ->andWhere('product')->eq((int)$productID)
+            ->andWhere('deleted')->eq(0)
+            ->orderBy($orderBy)
+            ->page($pager)
+            ->fetchGroup('plan');
        if(!$tmpStories) return array();
        $plans   = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('id')->in(array_keys($tmpStories))->fetchPairs();
        $stories = array();
@@ -421,6 +431,7 @@ class storyModel extends model
        return $this->dao->select('t1.*, t2.*')->from(TABLE_PROJECTSTORY)->alias('t1')
            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
            ->where('t1.project')->eq((int)$projectID)
+            ->andWhere('t2.deleted')->eq(0)
            ->orderBy('t2.pri')
            ->fetchAll('id');
    }
@@ -435,6 +446,7 @@ class storyModel extends model
            ->leftJoin(TABLE_PRODUCT)->alias('t3')
            ->on('t1.product = t3.id')
            ->where('t1.project')->eq((int)$projectID)
+            ->andWhere('t2.deleted')->eq(0)
            ->onCaseOf($productID)->andWhere('t1.product')->eq((int)$productID)->endCase()
            ->fetchAll();
        if(!$stories) return array();
@@ -447,13 +459,18 @@ class storyModel extends model
        return $this->dao->select('*')->from(TABLE_STORY)
            ->where('plan')->eq((int)$planID)
            ->onCaseOf($status != 'all')->andWhere('status')->in($status)->endCase()
+            ->andWhere('deleted')->eq(0)
            ->orderBy($orderBy)->page($pager)->fetchAll('id');
    }

    /* 获得某一个产品计划下面所有的需求列表。*/
    public function getPlanStoryPairs($planID, $status = 'all', $orderBy = 'id_desc', $pager = null)
    {
-        return $this->dao->select('*')->from(TABLE_STORY)->where('plan')->eq($planID)->onCaseOf($status != 'all')->andWhere('status')->in($status)->endCase()->fetchAll();
+        return $this->dao->select('*')->from(TABLE_STORY)
+            ->where('plan')->eq($planID)
+            ->onCaseOf($status != 'all')->andWhere('status')->in($status)->endCase()
+            ->andWhere('deleted')->eq(0)
+            ->fetchAll();
    }

    /* 获得指派给某一个用户的需求列表。*/
@@ -464,6 +481,7 @@ class storyModel extends model
            ->leftJoin(TABLE_PRODUCTPLAN)->alias('t2')->on('t1.plan = t2.id')
            ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id')
            ->where('t1.assignedTo')->eq($account)
+            ->andWhere('t1.deleted')->eq(0)
            ->orderBy($orderBy)->page($pager)->fetchAll();
    }

@@ -474,6 +492,7 @@ class storyModel extends model
            ->from(TABLE_PROJECTSTORY)->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
            ->where('t1.story')->eq((int)$storyID)
            ->andWhere('t2.status')->eq('doing')
+            ->andWhere('t2.deleted')->eq(0)
            ->fetchPairs();
        if($projects) return($this->dao->select('account')->from(TABLE_TEAM)->where('project')->in($projects)->fetchPairs('account'));
    }
@@ -26,15 +26,19 @@

 <div class='yui-d0'>
  <div id='titlebar'>
-    <div id='main'>STORY #<?php echo $story->id . $lang->colon . $story->title;?></div>
+    <div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . $lang->colon . $story->title;?></div>
    <div>
    <?php
    $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&moduleID=$story->module");
-    if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
-    if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
-    if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
-    if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
-    if(!common::printLink('story', 'edit',    "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
+    if(!$story->deleted)
+    {
+        if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
+        if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
+        if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
+        if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
+        if(!common::printLink('story', 'edit',    "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
+        common::printLink('story', 'delete', "storyID=$story->id", $lang->delete, 'hiddenwin');
+    }
    echo html::a($browseLink, $lang->goback);
    ?>
    </div>
@@ -55,11 +59,15 @@
      <?php include '../../common/view/action.html.php';?>
      <div class='a-center' style='font-size:16px; font-weight:bold'>
      <?php
-      if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
-      if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
-      if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
-      if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
-      if(!common::printLink('story', 'edit',    "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
+      if(!$story->deleted)
+      {
+          if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
+          if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
+          if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
+          if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
+          if(!common::printLink('story', 'edit',    "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
+          common::printLink('story', 'delete', "storyID=$story->id", $lang->delete, 'hiddenwin');
+      }
      echo html::a($browseLink, $lang->goback);
      ?>
      </div>