Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
@@ -98,3 +98,21 @@ $config->dev->tableMap['lang'] = 'custom';
|
||||
$config->dev->tableMap['config'] = 'custom';
|
||||
$config->dev->tableMap['module'] = 'tree';
|
||||
$config->dev->tableMap['suitecase'] = 'testcase';
|
||||
|
||||
$config->dev->postParams['bug']['create']['product'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['title'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['openedBuild'] = 'int|trunk';
|
||||
$config->dev->postParams['bug']['create']['branch'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['module'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['project'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['assignedTo'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['deadline'] = 'date';
|
||||
$config->dev->postParams['bug']['create']['type'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['os'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['browser'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['color'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['severity'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['pri'] = 'int';
|
||||
$config->dev->postParams['bug']['create']['steps'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['mailto'] = 'string';
|
||||
$config->dev->postParams['bug']['create']['keywords'] = 'string';
|
||||
|
||||
@@ -9,6 +9,12 @@ $lang->dev->params = 'Parameters';
|
||||
$lang->dev->type = 'Type';
|
||||
$lang->dev->desc = 'Description';
|
||||
$lang->dev->noParams = 'No Parameters';
|
||||
$lang->dev->post = 'POST Parameters';
|
||||
|
||||
$lang->dev->paramRange = 'Range of values: %s';
|
||||
$lang->dev->paramDate = 'Date format: YY-mm-dd. such as 2019-01-01';
|
||||
$lang->dev->paramColor = 'Color format: #RGB. such as #3da7f5';
|
||||
$lang->dev->paramMailto = "Use account. Separate multiple accounts by ','.";
|
||||
|
||||
$lang->dev->fields = array();
|
||||
$lang->dev->fields['id'] = 'ID';
|
||||
|
||||
@@ -9,6 +9,12 @@ $lang->dev->params = '参数列表';
|
||||
$lang->dev->type = '类型';
|
||||
$lang->dev->desc = '描述';
|
||||
$lang->dev->noParams = '无参数';
|
||||
$lang->dev->post = 'POST参数';
|
||||
|
||||
$lang->dev->paramRange = '取值范围:%s';
|
||||
$lang->dev->paramDate = '日期格式:YY-mm-dd,如:2019-01-01';
|
||||
$lang->dev->paramColor = '颜色格式:#RGB,如:#3da7f5';
|
||||
$lang->dev->paramMailto = "填写帐号,多个账号用','分隔。";
|
||||
|
||||
$lang->dev->fields = array();
|
||||
$lang->dev->fields['id'] = '序号';
|
||||
|
||||
@@ -134,17 +134,14 @@ class devModel extends model
|
||||
public function getAPIs($module)
|
||||
{
|
||||
$fileName = $this->app->getModuleRoot() . $module . DS . 'control.php';
|
||||
if($module != 'common' and $module != 'dev')
|
||||
{
|
||||
include $fileName;
|
||||
}
|
||||
if($module != 'common' and $module != 'dev') include $fileName;
|
||||
|
||||
$classReflect = new ReflectionClass($module);
|
||||
$methods = $classReflect->getMethods();
|
||||
$apis = array();
|
||||
foreach($methods as $method)
|
||||
{
|
||||
if($method->class == 'baseControl' or $method->class == 'control' or $method->name == '__construct') continue;
|
||||
|
||||
$api = array('name' => $method->name, 'post' => false, 'default' => array());
|
||||
$methodReflect = new ReflectionMethod($module, $method->name);
|
||||
foreach($methodReflect->getParameters() as $key => $param)
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
<?php foreach($apis as $api):?>
|
||||
<div class='detail'>
|
||||
<?php
|
||||
$methodName = $api['name'];
|
||||
$params = array();
|
||||
if(isset($api['param']))
|
||||
{
|
||||
@@ -69,6 +70,38 @@
|
||||
<tr><td colspan="3"><?php echo $lang->dev->noParams?></td></tr>
|
||||
<?php endif;?>
|
||||
</table>
|
||||
<?php if(isset($config->dev->postParams[$selectedModule][$methodName])):?>
|
||||
<?php
|
||||
$this->app->loadLang($selectedModule);
|
||||
$this->app->loadConfig($selectedModule);
|
||||
?>
|
||||
<table class='table table-bordered'>
|
||||
<caption><?php echo $lang->dev->post;?></caption>
|
||||
<tr>
|
||||
<td><?php echo $lang->dev->params?></td>
|
||||
<td><?php echo $lang->dev->type?></td>
|
||||
<td><?php echo $lang->dev->desc?></td>
|
||||
</tr>
|
||||
<?php foreach($config->dev->postParams[$selectedModule][$methodName] as $paramName => $paramType):?>
|
||||
<tr>
|
||||
<td><?php echo $paramName?></td>
|
||||
<td><?php echo $paramType?></td>
|
||||
<?php
|
||||
$paramDesc = '';
|
||||
$listKey = $paramName . 'List';
|
||||
if(isset($lang->$selectedModule->$paramName)) $paramDesc .= $lang->$selectedModule->$paramName . ' ';
|
||||
if(isset($lang->$selectedModule->$listKey)) $paramDesc .= sprintf($lang->dev->paramRange, join(' | ', array_keys($lang->$selectedModule->$listKey)));
|
||||
if($paramType == 'date') $paramDesc .= $lang->dev->paramDate;
|
||||
if($paramName == 'color') $paramDesc .= $lang->dev->paramColor;
|
||||
if(isset($config->$selectedModule->$methodName->requiredFields) and strpos($config->$selectedModule->$methodName->requiredFields, $paramName) !== false) $paramDesc .= "<span class='red'>*{$lang->required}</span>";
|
||||
if($paramName == 'product') $paramDesc .= "<span class='red'>*{$lang->required}</span>";
|
||||
if($paramName == 'mailto') $paramDesc .= $lang->dev->paramMailto;
|
||||
?>
|
||||
<td><?php echo $paramDesc?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</table>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach;?>
|
||||
|
||||
Reference in New Issue
Block a user