From f0914224f8cfa60c44400d4fc876484b85e600d2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 31 Oct 2017 13:15:10 +0800
Subject: [PATCH]  * adjust for task #3239.

---
 module/product/model.php | 2 ++
 module/project/model.php | 6 ++++--
 module/story/model.php   | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index fbf7193973..027b99de56 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -181,6 +181,8 @@ class productModel extends model
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProduct();
         $product = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
+        if(!$product) return false;
+
         return $this->loadModel('file')->replaceImgURL($product, 'desc');
     }
 
diff --git a/module/project/model.php b/module/project/model.php
index 9d118e88b8..2424cb8a3c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1217,11 +1217,13 @@ class projectModel extends model
 
         /* Link stories. */
         $projectStories = $this->loadModel('story')->getProjectStoryPairs($projectID);
+        $lastOrder      = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
         foreach($stories as $storyID)
         {
             if(!isset($projectStories[$storyID]))
             {
                 $story = $this->dao->findById($storyID)->fields("$projectID as project, id as story, product, version")->from(TABLE_STORY)->fetch();
+                $story->order = ++$lastOrder;
                 $this->dao->insert(TABLE_PROJECTSTORY)->data($story)->exec();
             }
         }
@@ -1377,8 +1379,8 @@ class projectModel extends model
     {
         if($this->post->stories == false) return false;
         $this->loadModel('action');
-        $versions = $this->loadModel('story')->getVersions($this->post->stories);
-        $lastOrder = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
+        $versions  = $this->loadModel('story')->getVersions($this->post->stories);
+        $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
         foreach($this->post->stories as $key => $storyID)
         {
             $productID = (int)$this->post->products[$storyID];
diff --git a/module/story/model.php b/module/story/model.php
index 042c367a7f..7a06787509 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -186,11 +186,13 @@ class storyModel extends model
 
             if($projectID != 0 and $story->status != 'draft') 
             {
+                $lastOrder = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
                 $this->dao->insert(TABLE_PROJECTSTORY)
                     ->set('project')->eq($projectID)
                     ->set('product')->eq($this->post->product)
                     ->set('story')->eq($storyID)
                     ->set('version')->eq(1)
+                    ->set('order')->eq($lastOrder + 1)
                     ->exec();
             }