diff --git a/api/v1/entries/builds.php b/api/v1/entries/builds.php index 3709a0463c..e303c9a4e1 100644 --- a/api/v1/entries/builds.php +++ b/api/v1/entries/builds.php @@ -21,6 +21,7 @@ class buildsEntry extends entry public function get($projectID = 0) { if(empty($projectID)) $projectID = $this->param('project', 0); + if(empty($projectID)) return $this->sendError(400, "Need project id."); $control = $this->loadController('project', 'build'); $control->build($projectID, $this->param('type', 'all'), $this->param('param', 0), $this->param('order', 't1.date_desc,t1.id_desc')); diff --git a/api/v1/entries/execution.php b/api/v1/entries/execution.php index 306d6f374b..c5cffb4fc0 100644 --- a/api/v1/entries/execution.php +++ b/api/v1/entries/execution.php @@ -64,6 +64,14 @@ class executionEntry extends Entry { switch($field) { + case 'modules': + $control = $this->loadController('tree', 'browsetask'); + $control->browsetask($executionID); + $data = $this->getData(); + if(isset($data->status) and $data->status == 'success') + { + $execution->modules = $data->data->tree; + } case 'builds': $execution->builds = $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,noterminate,nodone', $executionID, 'execution'); break; diff --git a/api/v1/entries/executionstories.php b/api/v1/entries/executionstories.php index d2f74e1126..4f32cb527c 100644 --- a/api/v1/entries/executionstories.php +++ b/api/v1/entries/executionstories.php @@ -34,7 +34,6 @@ class executionStoriesEntry extends entry $result = array(); foreach($stories as $story) { - $story->name =$story->title; $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)); diff --git a/api/v1/entries/productplans.php b/api/v1/entries/productplans.php index e903903f4c..f56cf3ae96 100644 --- a/api/v1/entries/productplans.php +++ b/api/v1/entries/productplans.php @@ -36,7 +36,6 @@ class productplansEntry extends entry foreach($plans as $plan) { - $plan->name = $plan->title; if($plan->parent > 0 and isset($result[$plan->parent])) { $parentPlan = $result[$plan->parent]; diff --git a/config/config.php b/config/config.php index 6271d1a45d..b6b562c975 100644 --- a/config/config.php +++ b/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.