From 15d243767d55a76f87da49a556e2b0750da630a7 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Fri, 29 Apr 2022 15:56:01 +0800
Subject: [PATCH] * Fix api.

---
 api/v1/entries/feedback.php | 10 ++++++----
 api/v1/entries/stories.php  |  8 +++++---
 module/story/control.php    |  2 +-
 module/story/model.php      |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/api/v1/entries/feedback.php b/api/v1/entries/feedback.php
index 5cc13fa88d..ed0474b1e1 100644
--- a/api/v1/entries/feedback.php
+++ b/api/v1/entries/feedback.php
@@ -26,10 +26,12 @@ class feedbackEntry extends Entry
         $data = $this->getData();
 
         $feedback = $data->data->feedback;
- 
-        $feedback->productName = $data->data->product;
-        $feedback->moduleName  = $data->data->modulePath[0]->name ? $data->data->modulePath[0]->name : '/';
-        
+
+        $feedback->productName  = $data->data->product;
+        $feedback->moduleName   = $data->data->modulePath[0]->name ? $data->data->modulePath[0]->name : '/';
+        $feedback->resultType   = $data->data->type;
+        if($feedback->resultInfo->deleted == 0) $feedback->resultStatus = $this->loadModel('feedback')->processStatus($feedback->resultType, $feedback->resultInfo);
+
         if(!$data or !isset($data->status)) return $this->send400('error');
         if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message);
 
diff --git a/api/v1/entries/stories.php b/api/v1/entries/stories.php
index d1bc48d5b6..15b7193452 100644
--- a/api/v1/entries/stories.php
+++ b/api/v1/entries/stories.php
@@ -30,15 +30,17 @@ class storiesEntry extends entry
         if(!$data or !isset($data->status)) return $this->sendError(400, 'error');
         if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message);
 
-        $stories = $data->data->stories;
-        $pager   = $data->data->pager;
+        $stories      = $data->data->stories;
+        $pager        = $data->data->pager;
+        $requirements = $this->loadModel('story')->getRequirements($productID);
+
         $result  = array();
         foreach($stories as $story)
         {
             if(isset($story->children)) $story->children = array_values((array)$story->children);
             $result[] = $this->format($story, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList');
         }
-        return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'stories' => $result));
+        return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'stories' => $result, 'requirements' => $requirements));
     }
 
     /**
diff --git a/module/story/control.php b/module/story/control.php
index 11d75168ca..0142830bc2 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -367,7 +367,7 @@ class story extends control
         $this->view->keywords         = $keywords;
         $this->view->mailto           = $mailto;
         $this->view->blockID          = $blockID;
-        $this->view->URS              = $type == 'story' ? $this->story->getRequierements($productID) : '';
+        $this->view->URS              = $type == 'story' ? $this->story->getRequirements($productID) : '';
         $this->view->needReview       = ($this->app->user->account == $product->PO || $objectID > 0 || $this->config->story->needReview == 0) ? "checked='checked'" : "";
         $this->view->type             = $type;
 
diff --git a/module/story/model.php b/module/story/model.php
index 9cae0c63fd..e021bdd702 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -171,7 +171,7 @@ class storyModel extends model
      *  @access public
      *  @return void
      */
-    public function getRequierements($productID)
+    public function getRequirements($productID)
     {
         return $this->dao->select('id,title')->from(TABLE_STORY)
            ->where('deleted')->eq(0)