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:
wangyidong
2021-07-20 14:18:19 +08:00
parent c757f08599 391ac55824
commit 6f8222ae97
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+1
View File
@@ -691,6 +691,7 @@ class customModel extends model
{
$this->loadModel('setting');
$this->setting->setItem('system.custom.sprintConcept', $this->post->sprintConcept);
$this->setting->setItem('system.custom.productProject', '0_' . $this->post->sprintConcept);
/* Change block title. */
$oldConfig = isset($this->config->custom->sprintConcept) ? $this->config->custom->sprintConcept : '0';
module/upgrade/view/mergebyline.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
</div>
<div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
</div>
</div>
<div class='line-groups'>
module/upgrade/view/mergebyproduct.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
</div>
<div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
</div>
</div>
<div class='line-groups'>
module/upgrade/view/mergebysprint.html.php
+1 -1
View File
@@ -9,7 +9,7 @@
<div class='cell'>
<div class='lineGroup-title'>
<div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
<input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
</div>
</div>
<div class='line-groups sprintGroup'>
module/upgrade/view/mergeprogram.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<table class='table table-hover table-form'>
<thead>
<tr>
<th><?php echo $lang->executionCommon;?></th>
<th><?php echo $lang->projectCommon;?></th>
<th class='divider'></th>
<th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
</tr>