diff --git a/api/v1/entries/options.php b/api/v1/entries/options.php new file mode 100644 index 0000000000..78da54c56a --- /dev/null +++ b/api/v1/entries/options.php @@ -0,0 +1,46 @@ + + * @package entries + * @version 1 + * @link http://www.zentao.net + */ +class optionsEntry extends entry +{ + /** + * GET method. + * + * @param string $type + * @access public + * @return void + */ + public function get($type = '') + { + if(!$type) return $this->sendError(400, 'error'); + + $options = array(); + switch($type) + { + case 'bug': + $this->app->loadLang('bug'); + $options['type'] = $this->lang->bug->typeList; + $options['pri'] = $this->lang->bug->priList; + $options['severity'] = $this->lang->bug->severityList; + + $options['modules'] = array(); + $product = $this->param('product', 0); + if($product) $options['modules'] = $this->loadModel('tree')->getOptionMenu($product, 'bug'); + + $execution = $this->param('execution', 0); + $options['build'] = $this->loadModel('build')->getBuildPairs($product, 'all', '', $execution, 'execution'); + + break; + } + + return $this->send(200, array('options' => $options)); + } +} diff --git a/config/routes.php b/config/routes.php index c7af65ffab..035417268a 100644 --- a/config/routes.php +++ b/config/routes.php @@ -16,6 +16,8 @@ $routes['/tabs/:module'] = 'tabs'; $routes['/files'] = 'files'; $routes['/files/:id'] = 'file'; +$routes['/options/:type'] = 'options'; + $routes['/configurations'] = 'configs'; $routes['/configurations/:name'] = 'config'; diff --git a/module/bug/control.php b/module/bug/control.php index f692cd8dc7..2f7ae401a4 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -1260,13 +1260,13 @@ class bug extends control } } if(defined('RUN_MODE') && RUN_MODE == 'api') - { + { return $this->send(array('status' => 'success', 'data' => $bugID)); - } - else - { + } + else + { return print(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); - } + } } if($this->app->tab == 'project') @@ -2235,7 +2235,7 @@ class bug extends control } /** - * Ajax get bug filed options for auto test. + * Ajax get bug field options for auto test. * * @param int $productID * @param int $executionID