Merge branch 'Zentao_app1.1' of https://gitlab.zcorp.cc/easycorp/zentaopms into app

api/v1/entries/executionmembers.php

@@ -1,25 +0,0 @@
-<?php
-/**
- * The execution cases entry point of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     entries
- * @version     1
- * @link        http://www.zentao.net
- */
-class executionMembersEntry extends entry
-{
-    public function get($executionID = 0)
-    {
-        if(!$executionID) $executionID = $this->param('execution', 0);
-        if(empty($executionID)) return $this->sendError(400, 'Need execution id.');
-        $members = $this->loadModel('execution')->getTeamMembers($executionID);
-        if(isset($members))
-        {
-            foreach($members as $member) $result[] = $this->format($member, 'join:date');
-        }
-        return $this->send(200, array('members' => $result));
-    }
-}

api/v1/entries/modulestories.php

@@ -15,16 +15,15 @@ class moduleStoriesEntry extends Entry
     {
         $executionID = $this->param('executionID', 0);
         if(empty($executionID)) return $this->sendError(400, 'Need execution id.');
-        $control = $this->loadController('story', 'ajaxGetExecutionStories');
-        $control->ajaxGetExecutionStories($executionID, $this->param('productID', 0), $this->param('branchID', 0), $moduleID);
+
+        $control = $this->loadController('execution', 'story');
+        $control->story($executionID, 'order_desc', 'byModule', $moduleID);
 
         $data = $this->getData();
-        $this->loadModel('story');
+
         $result = [];
-        foreach($data as $storyID => $storyName)
+        foreach($data->data->stories as $story)
         {
-            if(empty($storyID)) continue;
-            $story = $this->story->getById($storyID);
             $result[] = $this->filterFields($story, 'id,title,module,pri,status,stage,estimate');
         }
         return $this->send(200, array('stories' => $result));

api/v1/entries/stories.php

@@ -54,7 +54,7 @@ class storiesEntry extends entry
         if(!$productID and isset($this->requestBody->product)) $productID = $this->requestBody->product;
         if(!$productID) return $this->sendError(400, 'Need product id.');
 
-        $fields = 'title,spec,verify,reviewer,type,plan,module,moduleOptionMenu,source,sourceNote,category,pri,estimate,mailto,keywords';
+        $fields = 'title,spec,verify,reviewer,type,plan,module,moduleOptionMenu,source,sourceNote,category,pri,estimate,mailto,keywords,notifyemail';
         $this->batchSetPost($fields);
 
         /* If reviewer is not post, set needNotReview. */

api/v1/entries/storyrecall.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * The story entry point of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     entries
+ * @version     1
+ * @link        http://www.zentao.net
+ */
+class storyRecallEntry extends Entry
+{
+    /**
+     * Recall method.
+     *
+     * @param  int    $storyID
+     * @access public
+     * @return void
+     */
+    public function delete($storyID)
+    {
+        $control = $this->loadController('story', 'recall');
+        $control->recall($storyID);
+
+        $this->getData();
+        $this->sendSuccess(200, 'success');
+    }
+}
+

api/v1/entries/taskcomponent.php

@@ -20,7 +20,7 @@ class taskComponentEntry extends Entry
      */
     public function post($taskID)
     {
-        $fields = 'name,type,assignedTo,parent,estimate,story,module,pri,desc,estStarted,deadline';
+        $fields = 'name,color,type,assignedTo,parent,estimate,story,module,pri,desc,estStarted,deadline';
         $this->batchSetPost($fields);
 
         $fields = explode(',', $fields);

config/config.php

@@ -23,7 +23,7 @@ $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The co
 $config->timezone      = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
 $config->webRoot       = '';                   // URL根目录。       The root path of the url.
 $config->customSession = false;                // 是否开启自定义session的存储路径。Whether custom the session save path.
-$config->edition       = 'open';               // 设置系统的edition，可选值：open|biz|max。Set edition, optional: open|biz|max.
+$config->edition       = 'max';               // 设置系统的edition，可选值：open|biz|max。Set edition, optional: open|biz|max.
 
 /* 框架路由相关设置。Routing settings. */
 $config->requestType = 'PATH_INFO';               // 请求类型：PATH_INFO|PATHINFO2|GET。    The request type: PATH_INFO|PATH_INFO2|GET.

config/routes.php

@@ -50,6 +50,7 @@ $routes['/stories/:id/active']         = 'storyActive';
 $routes['/stories/:id/assign']         = 'storyAssignto';
 $routes['/stories/:id/recordEstimate'] = 'storyRecordEstimate';
 $routes['/stories/:id/child']          = 'storyChild';
+$routes['/stories/:id/recall']         = 'storyRecall';
 
 $routes['/module/:id/stories'] = 'moduleStories';