Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix api.

Browse Source
This commit is contained in:
zhengrunyu
2022-04-29 15:56:01 +08:00
parent 38a95abfab
commit 15d243767d
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/feedback.php
+6 -4
View File
@@ -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);
api/v1/entries/stories.php
+5 -3
View File
@@ -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));
}
/**
module/story/control.php
+1 -1
View File
@@ -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;
module/story/model.php
+1 -1
View File
@@ -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)