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

* adjust setrule page.

Browse Source
This commit is contained in:
wangyidong
2020-03-09 15:52:14 +08:00
parent 0f1432cc5f
commit 88ffd189e1
6 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module/repo/config.php
View File

@@ -40,19 +40,17 @@ $config->repo->edit->requiredFields = 'SCM,name,path,encoding,client';
$config->repo->svn = new stdclass();
$config->repo->svn->requiredFields = 'account,password';
$config->repo->rules['module']['task'] = 'Task';
$config->repo->rules['module']['bug'] = 'Bug';
$config->repo->rules['task']['start'] = 'Start';
$config->repo->rules['task']['finish'] = 'Finish';
$config->repo->rules['task']['logEfforts'] = 'Effort';
$config->repo->rules['task']['consumed'] = 'Cost';
$config->repo->rules['task']['left'] = 'Left';
$config->repo->rules['bug']['resolve'] = 'Fix';
$config->repo->rules['bug']['resolvedBuild'] = 'Build';
$config->repo->rules['id']['mark'] = '#';
$config->repo->rules['id']['split'] = ',';
$config->repo->rules['mark']['consumed'] = ':';
$config->repo->rules['mark']['left'] = ':';
$config->repo->rules['mark']['resolvedBuild'] = '#';
$config->repo->rules['unit']['consumed'] = 'h';
$config->repo->rules['unit']['left'] = 'h';
$config->repo->rules['module']['task'] = 'Task';
$config->repo->rules['module']['bug'] = 'Bug';
$config->repo->rules['task']['start'] = 'Start';
$config->repo->rules['task']['finish'] = 'Finish';
$config->repo->rules['task']['logEfforts'] = 'Effort';
$config->repo->rules['task']['consumed'] = 'Cost';
$config->repo->rules['task']['left'] = 'Left';
$config->repo->rules['bug']['resolve'] = 'Fix';
$config->repo->rules['id']['mark'] = '#';
$config->repo->rules['id']['split'] = ',';
$config->repo->rules['mark']['consumed'] = ':';
$config->repo->rules['mark']['left'] = ':';
$config->repo->rules['unit']['consumed'] = 'h';
$config->repo->rules['unit']['left'] = 'h';

20
module/repo/js/setrules.js
View File

@@ -165,8 +165,6 @@ function replaceExample()
var resolveBug = $('[id*=bug][id*="resolve\]"]').val().split(';');
var bugModule = $('[id*=module][id*=bug]').val().split(';');
var builds = $('[id*=bug][id*=resolvedBuild]').val().split(';');
var buildMarks = $('[id*=mark][id*=resolvedBuild]').val().split(';');
for(i in resolveBug)
{
resolve = resolveBug[i];
@@ -179,20 +177,10 @@ function replaceExample()
for(l in idSplit)
{
split = idSplit[l];
for(m in builds)
{
build = builds[m];
for(n in buildMarks)
{
buildMark = buildMarks[n];
html += '<br />' + rulesExample['bug']['resolve'].replace('%resolve%', resolve)
.replace('%bug%', bug)
.replace('%id%', id)
.replace('%split%', split)
.replace('%resolvedBuild%', build)
.replace('%buildmark%', buildMark);
}
}
html += '<br />' + rulesExample['bug']['resolve'].replace('%resolve%', resolve)
.replace('%bug%', bug)
.replace('%id%', id)
.replace('%split%', split);
}
}
}

2
module/repo/lang/en.php
View File

@@ -130,7 +130,7 @@ $lang->repo->rules = new stdclass();
$lang->repo->rules->exampleLabel = "Comment Example";
$lang->repo->rules->example['task']['start'] = "%start% %task% %id%1%split%2 %cost%%consumedmark%1 %left%%leftmark%3";
$lang->repo->rules->example['task']['finish'] = "%finish% %task% %id%1%split%2 %cost%%consumedmark%10";
$lang->repo->rules->example['bug']['resolve'] = "%resolve% %bug% %id%1%split%2 %resolvedBuild% %buildmark%10";
$lang->repo->rules->example['bug']['resolve'] = "%resolve% %bug% %id%1%split%2";
$lang->repo->error = new stdclass();
$lang->repo->error->useless = 'Your server disabled exec and shell_exec, so it cannot be applied.';

2
module/repo/lang/zh-cn.php
View File

@@ -137,7 +137,7 @@ $lang->repo->rules->exampleLabel = "注释示例";
$lang->repo->rules->example['task']['start'] = "%start% %task% %id%1%split%2 %cost%%consumedmark%1%cunit% %left%%leftmark%3%lunit%";
$lang->repo->rules->example['task']['finish'] = "%finish% %task% %id%1%split%2 %cost%%consumedmark%10%cunit%";
$lang->repo->rules->example['task']['effort'] = "%effort% %task% %id%1%split%2 %cost%%consumedmark%1%cunit% %left%%leftmark%3%lunit%";
$lang->repo->rules->example['bug']['resolve'] = "%resolve% %bug% %id%1%split%2 %resolvedBuild% %buildmark%10";
$lang->repo->rules->example['bug']['resolve'] = "%resolve% %bug% %id%1%split%2";
$lang->repo->error = new stdclass();
$lang->repo->error->useless = '你的服务器禁用了exec,shell_exec方法，无法使用该功能';

8
module/repo/model.php
View File

@@ -1152,8 +1152,6 @@ class repoModel extends model
$costMarks = str_replace(';', '|', preg_replace('/([^;])/', '\\\\\1', trim($rules['mark']['consumed'], ';')));
$lefts = str_replace(';', '|', trim($rules['task']['left'], ';'));
$leftMarks = str_replace(';', '|', preg_replace('/([^;])/', '\\\\\1', trim($rules['mark']['left'], ';')));
$builds = str_replace(';', '|', trim($rules['bug']['resolvedBuild'], ';'));
$buildMarks = str_replace(';', '|', preg_replace('/([^;])/', '\\\\\1', trim($rules['mark']['resolvedBuild'], ';')));
$taskModule = str_replace(';', '|', trim($rules['module']['task'], ';'));
$bugModule = str_replace(';', '|', trim($rules['module']['bug'], ';'));
$costUnit = str_replace(';', '|', trim($rules['unit']['consumed'], ';'));
@@ -1167,19 +1165,17 @@ class repoModel extends model
$bugReg = "(($bugModule) +(({$idMarks})[0-9]+(({$idSplits})[0-9]+)*))";
$costReg = "($costs) *(($costMarks)([0-9]+)($costUnit))";
$leftReg = "($lefts) *(($leftMarks)([0-9]+)($leftUnit))";
$buildReg = "($builds) *(($buildMarks)([0-9]+))";
$startTaskReg = "({$startAction}) *{$taskReg} +$costReg +$leftReg";
$effortTaskReg = "({$effortAction}) *{$taskReg} +$costReg +$leftReg";
$finishTaskReg = "({$finishAction}) *{$taskReg} +$costReg";
$resolveBugReg = "({$resolveAction}) *{$bugReg} +$buildReg";
$resolveBugReg = "({$resolveAction}) *{$bugReg}";
$reg = array();
$reg['taskReg'] = $taskReg;
$reg['bugReg'] = $bugReg;
$reg['costReg'] = $costReg;
$reg['leftReg'] = $leftReg;
$reg['buildReg'] = $buildReg;
$reg['startTaskReg'] = $startTaskReg;
$reg['effortTaskReg'] = $effortTaskReg;
$reg['finishTaskReg'] = $finishTaskReg;
@@ -1277,9 +1273,9 @@ class repoModel extends model
$action->project = $productsAndProjects[$bugID]->project;
foreach($bugActions as $bugAction => $params)
{
foreach($params as $field => $param) $this->post->set($field, $param);
if($bugAction == 'resolve')
{
$this->post->set('resolvedBuild', 'trunk');
$this->post->set('resolution', 'fixed');
$changes = $this->bug->resolve($bugID);
if($changes)

23
module/repo/view/setrules.html.php
View File

@@ -20,7 +20,7 @@
<tbody>
<tr>
<th class='w-110px'><?php echo $lang->repo->objectRule;?></th>
<td>
<td class='w-400px'>
<div class='input-group'>
<?php foreach($config->repo->rules['module'] as $module => $match):?>
<span class='input-group-addon'><?php echo $lang->{$module}->common;?></span>
@@ -28,6 +28,8 @@
<?php endforeach;?>
</div>
</td>
<td class='w-150px'></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->repo->objectIdRule;?></th>
@@ -49,16 +51,19 @@
<?php echo html::input("rules[task][start]", $config->repo->rules['task']['start'], "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->task->common . $space . $lang->task->finish;?></span>
<?php echo html::input("rules[task][finish]", $config->repo->rules['task']['finish'], "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->task->common . $space . $lang->task->logEfforts;?></span>
<?php echo html::input("rules[task][logEfforts]", $config->repo->rules['task']['logEfforts'], "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->bug->common . $space . $lang->bug->resolve;?></span>
<?php echo html::input("rules[bug][resolve]", $config->repo->rules['bug']['resolve'], "class='form-control'");?>
</div>
</td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->repo->manHourRule;?></th>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->common . $space . $lang->task->logEfforts;?></span>
<?php echo html::input("rules[task][logEfforts]", $config->repo->rules['task']['logEfforts'], "class='form-control'");?>
</div>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->consumed?></span>
<?php echo html::input("rules[task][consumed]", $config->repo->rules['task']['consumed'], "class='form-control'");?>
@@ -75,24 +80,18 @@
<span class='input-group-addon'><?php echo $lang->repo->ruleUnit?></span>
<?php echo html::input("rules[unit][left]", $config->repo->rules['unit']['left'], "class='form-control'");?>
</div>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->bug->resolvedBuild?></span>
<?php echo html::input("rules[bug][resolvedBuild]", $config->repo->rules['bug']['resolvedBuild'], "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->repo->mark?></span>
<?php echo html::input("rules[mark][resolvedBuild]", $config->repo->rules['mark']['resolvedBuild'], "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th></th>
<td colspan='2'><?php echo $lang->repo->ruleSplit;?></td>
<td class='red' colspan='3'><?php echo $lang->repo->ruleSplit;?></td>
</tr>
<tr>
<th><?php echo $lang->repo->rules->exampleLabel;?></th>
<td colspan='2' id='example'></td>
<td colspan='3' id='example'></td>
</tr>
<tr>
<td colspan='3' class='text-center'>
<td colspan='4' class='text-center'>
<?php echo html::submitButton();?>
<?php echo html::backButton();?>
</td>