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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-07-16 11:29:11 +08:00
parent 0a63fa55d6 8a29874b14
commit c3bfd5a36a
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+1 -3
View File
@@ -225,8 +225,6 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang->
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
//if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
//$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
if($config->systemMode == 'new') $lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|");
$lang->execution->menu = new stdclass();
@@ -316,7 +314,7 @@ $lang->qa->dividerMenu = ',bug,testtask,caselib,';
/* DevOps menu. */
$lang->devops->menu = new stdclass();
$lang->devops->menu->code = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccomment,showsynccommit');
$lang->devops->menu->code = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccommit');
$lang->devops->menu->compile = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job');
$lang->devops->menu->jenkins = array('link' => "Jenkins|jenkins|browse", 'alias' => 'create,edit');
$lang->devops->menu->maintain = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit');
module/execution/view/executionkanban.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</tr>
</thead>
<tbody>
<?php $rowIndex = 0; ?>
<?php $rowIndex = 0;?>
<?php foreach($kanbanGroup as $projectID => $executionList):?>
<tr>
<td class='board-project color-<?php echo $rowIndex;?>'>
module/group/lang/resource.php
+1 -2
View File
@@ -533,7 +533,6 @@ $lang->release->methodOrder[70] = 'changeStatus';
/* Execution. */
$lang->resource->execution = new stdclass();
//$lang->resource->execution->index = 'index';
$lang->resource->execution->view = 'view';
$lang->resource->execution->browse = 'browse';
$lang->resource->execution->create = 'createExec';
@@ -1133,7 +1132,7 @@ $lang->gitlab->methodOrder[15] = 'edit';
$lang->gitlab->methodOrder[20] = 'importIssue';
$lang->gitlab->methodOrder[30] = 'delete';
$lang->gitlab->methodOrder[35] = 'bindUser';
$lang->gitlab->methodOrder[40] = 'bindProduct';
$lang->gitlab->methodOrder[40] = 'bindProduct';
/* Git. */
$lang->resource->git = new stdclass();
module/install/view/step4.html.php
+5 -4
View File
@@ -64,15 +64,16 @@
</tr>
<tr>
<th><?php echo $lang->install->selectedMode;?></th>
<td><?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
</td>
<td>
<?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
</td>
</tr>
<tr>
<th></th>
<td>
<div class='text-info'><?php echo $lang->install->selectedModeTips;?></div>
</td>
</td>
</tr>
<tr>
<th></th><td><?php echo html::checkBox('importDemoData', $lang->install->importDemoData);?></td>
module/message/css/setting.css
+1 -1
View File
@@ -1,5 +1,5 @@
.checkbox-primary + .checkbox-primary {margin: 0px;}
.checkbox-primary {margin: 0px; width: 120px; float:left;}
.checkbox-primary {margin: 0px; width: 120px; float: left;}
.checkbox-primary label {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
div.chosen-container + select + div.chosen-container > .chosen-choices {border-top: 0px;}
module/task/model.php
+11 -11
View File
@@ -116,7 +116,7 @@ class taskModel extends model
->checkIF($task->estimate != '', 'estimate', 'float')
->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
->exec();
if(dao::isError()) return false;
$taskID = $this->dao->lastInsertID();
@@ -459,9 +459,9 @@ class taskModel extends model
/**
* Create task from gitlab issue.
*
* @param object $task
* @param int $executionID
*
* @param object $task
* @param int $executionID
* @access public
* @return int
*/
@@ -474,18 +474,18 @@ class taskModel extends model
$task->module = 0;
$task->estimate = 0;
$task->estStarted = '0000-00-00';
$task->left = 1;
$task->type = 'devel';
$task->left = 1;
$task->type = 'devel';
$this->dao->insert(TABLE_TASK)->data($task, $skip = 'id,product')
->autoCheck()
->batchCheck($this->config->task->create->requiredFields, 'notempty')
->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
->exec();
if(dao::isError()) return false;
return $this->dao->lastInsertID();
return $this->dao->lastInsertID();
}
/**
@@ -1297,8 +1297,8 @@ class taskModel extends model
if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID);
if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
$allChanges[$taskID] = common::createChanges($oldTask, $task);
/* update task to gitlab issue. */
/* Update task to gitlab issue. */
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('task', $taskID);
if(!empty($relation)) $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task, $taskID);
module/testtask/model.php
+1
View File
@@ -2188,6 +2188,7 @@ class testtaskModel extends model
$caseStep->type = 'step';
$caseStep->desc = '';
$caseStep->expect = $step->checkPoints[0]->expect;
$case->steps[] = $caseStep;
}
$result->caseResult = $stepStatus;