From e2501b26ea1157093777ffbb16674df280570483 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Tue, 26 Apr 2022 05:12:29 +0000 Subject: [PATCH 1/4] * Fix bug #15975. --- module/upgrade/js/mergeprogram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js index 6c5641da4f..5fe8236d92 100644 --- a/module/upgrade/js/mergeprogram.js +++ b/module/upgrade/js/mergeprogram.js @@ -369,7 +369,7 @@ $(function() $(target).removeClass('hidden'); /* Replace program name. */ - if($("[id^='productLines\[" + currentLine +"\]'").prop('checked')) $('#programName').val($(this).text()); + if(!$('#programName').val() && $("[id^='productLines\[" + currentLine +"\]'").prop('checked')) $('#programName').val($(this).text()); /* Replace project name. */ var productID = $(target).find('.lineGroup .productList input[name*="product"]').val(); From e8b57c9889f4900cf891854e62e7fc3c1b1ae9ac Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Tue, 26 Apr 2022 06:28:57 +0000 Subject: [PATCH 2/4] * Fix bug #17230. --- module/upgrade/control.php | 6 +++--- module/upgrade/model.php | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 823f95fb62..5cbf1357fc 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -83,7 +83,7 @@ class upgrade extends control $version = str_replace(array(' ', '.'), array('', '_'), $this->config->installedVersion); $version = strtolower($version); - if($this->config->visions == ',lite,') + if($this->config->visions == ',lite,') { $installedVersion = str_replace('.', '_', $this->config->installedVersion); $version = array_search($installedVersion, $this->config->upgrade->liteVersion); @@ -92,7 +92,7 @@ class upgrade extends control { if(strpos($key, 'lite') === false) unset($this->lang->upgrade->fromVersions[$key]); } - + $this->config->version = ($this->config->edition == 'biz' ? 'LiteVIP' : 'Lite') . $this->config->liteVersion; } @@ -640,7 +640,7 @@ class upgrade extends control $this->dao->update(TABLE_PROJECT)->set('name')->eq($projectName)->where('id')->eq($projectID)->exec(); } - return print(js::closeModal('parent.parent', '')); + return print(js::reload('parent.parent', '')); } $objectGroup = array(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 68ffad56fe..da338659d6 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -4528,6 +4528,33 @@ class upgradeModel extends model if(isset($data->projectName) and $data->projectType == 'execution' and empty($data->projectName)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->projectName))); + if($data->projectType == 'project') + { + $projectPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION) ->where('deleted')->eq('0') + ->andWhere('id')->in($projectIdList) + ->fetchPairs(); + + $projectNames = array(); + $duplicateList = ''; + foreach($projectPairs as $projectID => $projectName) + { + if(isset($projectNames[$projectName])) + { + $duplicateList .= "$projectID,"; + $duplicateList .= "{$projectNames[$projectName]},"; + continue; + } + + $projectNames[$projectName] = $projectID; + } + + if($duplicateList) + { + echo ""; + die; + } + } + /* Insert program. */ $program = new stdclass(); $program->name = $data->programName; @@ -6183,22 +6210,22 @@ class upgradeModel extends model } } - /** + /** * Update the project status. * * @access public * @return void - */ + */ public function updateProjectStatus() { - $projects = $this->dao->select('*')->from(TABLE_PROJECT) + $projects = $this->dao->select('*')->from(TABLE_PROJECT) ->where('deleted')->eq('0') ->andWhere('status')->eq('doing') ->andWhere('type')->eq('project') ->andWhere('realBegan')->eq('0000-00-00') ->fetchAll('id'); - if(empty($projects)) return; + if(empty($projects)) return; $projectIDList = array_keys($projects); From 4c031465dcf249ed514102efab53f2e623830cde Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Tue, 26 Apr 2022 07:38:12 +0000 Subject: [PATCH 3/4] * Fix bug #22005. --- db/update16.5.sql | 1 + db/zentao.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/db/update16.5.sql b/db/update16.5.sql index ae5b49e6c4..afb1d27fd1 100644 --- a/db/update16.5.sql +++ b/db/update16.5.sql @@ -43,6 +43,7 @@ ALTER TABLE `zt_opportunity` MODIFY COLUMN `prevention` mediumtext NOT NULL; ALTER TABLE `zt_opportunity` MODIFY COLUMN `resolution` mediumtext NOT NULL; ALTER TABLE `zt_trainplan` MODIFY COLUMN `summary` mediumtext NOT NULL; ALTER TABLE `zt_gapanalysis` MODIFY COLUMN `analysis` mediumtext NOT NULL; +ALTER TABLE `zt_bug` MODIFY COLUMN `entry` text NOT NULL; ALTER TABLE `zt_file` MODIFY COLUMN `title` varchar(255) NOT NULL; diff --git a/db/zentao.sql b/db/zentao.sql index 0b680fb3e3..37d7525b6f 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -206,7 +206,7 @@ CREATE TABLE IF NOT EXISTS `zt_bug` ( `result` mediumint(8) unsigned NOT NULL, `repo` mediumint(8) unsigned NOT NULL, `mr` mediumint(8) unsigned NOT NULL, - `entry` varchar(255) NOT NULL, + `entry` text NOT NULL, `lines` varchar(10) NOT NULL, `v1` varchar(40) NOT NULL, `v2` varchar(40) NOT NULL, From ece5cdbd21e442641e1852975db2eaef377e1054 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Tue, 26 Apr 2022 07:48:53 +0000 Subject: [PATCH 4/4] * Adjsut code. --- module/upgrade/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index da338659d6..4b37cc7b82 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -4530,7 +4530,8 @@ class upgradeModel extends model if($data->projectType == 'project') { - $projectPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION) ->where('deleted')->eq('0') + $projectPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION) + ->where('deleted')->eq('0') ->andWhere('id')->in($projectIdList) ->fetchPairs();