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

* add new version and upgrade.

Browse Source
This commit is contained in:
z
2020-06-01 14:58:04 +08:00
parent af6a2f26bc
commit 2539193d30
13 changed files with 1094 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
12.3.1
12.3.2
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '12.3.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '12.3.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
db/standard/zentao12.3.2.sql
+1066
View File
File diff suppressed because it is too large Load Diff
framework/control.class.php
+1 -1
View File
@@ -303,7 +303,7 @@ class control extends baseControl
$fields = $this->loadModel('workflowaction')->getFields($this->moduleName, $this->methodName);
$layouts = $this->loadModel('workflowlayout')->getFields($this->moduleName, $this->methodName);
$rules = $this->dao->select('*')->from(TABLE_WORKFLOWRULE)->where('deleted')->eq(0)->orderBy('id_desc')->fetchAll('id');
$rules = $this->dao->select('*')->from(TABLE_WORKFLOWRULE)->orderBy('id_desc')->fetchAll('id');
$requiredFields = '';
$mustPostFields = '';
module/misc/lang/de.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Letzte Version';
$lang->misc->feature->detailed = 'Details';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible xuanxuan.', 'desc' => '');
module/misc/lang/en.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Detail';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible Xuanxuan IM.', 'desc' => '');
module/misc/lang/fr.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Dernière Version';
$lang->misc->feature->detailed = 'Détail';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'Add parent-child story, compatible xuanxuan.', 'desc' => '');
module/misc/lang/vi.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Chi tiết';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'Fix workflow', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'Fix bugs of high severity.', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'Integrate unit test, open the continuous integration closed-loop.', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'Thêm parent-child story, compatible xuanxuan.', 'desc' => '');
module/misc/lang/zh-cn.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'修复工作流。', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'修复重要程度高的Bug。', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'集成单元测试，打通持续集成闭环。', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'增加父子需求，兼容最新喧喧。', 'desc' => '');
module/misc/lang/zh-tw.php
+2
View File
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '詳情';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
$lang->misc->releaseDate['12.3'] = '2020-04-08';
$lang->misc->releaseDate['12.2'] = '2020-03-25';
@@ -128,6 +129,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['12.3.2'][] = array('title'=>'修復工作流。', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'修復重要程度高的Bug。', 'desc' => '');
$lang->misc->feature->all['12.3'][] = array('title'=>'整合單元測試，打通持續整合閉環。', 'desc' => '');
$lang->misc->feature->all['12.2'][] = array('title'=>'增加父子需求，兼容最新喧喧。', 'desc' => '');
module/testcase/control.php
+8 -1
View File
@@ -1203,7 +1203,14 @@ class testcase extends control
$case->stepExpect = '';
$case->real = '';
$result = isset($results[$case->id]) ? $results[$case->id] : array();
$case->real = empty($result) ? '' : $result[0]['real'];
$case->real = '';
if(!empty($result))
{
$firstStep = reset($result);
$case->real = $firstStep['real'];
}
if(isset($relatedSteps[$case->id]))
{
$i = $childId = 0;
module/upgrade/lang/version.php
+1
View File
@@ -121,3 +121,4 @@ $lang->upgrade->fromVersions['12_0_1'] = '12.0.1';
$lang->upgrade->fromVersions['12_1'] = '12.1';
$lang->upgrade->fromVersions['12_2'] = '12.2';
$lang->upgrade->fromVersions['12_3'] = '12.3';
$lang->upgrade->fromVersions['12_3_1'] = '12.3.1';
module/upgrade/model.php
+4
View File
@@ -589,6 +589,9 @@ class upgradeModel extends model
case '12_3':
$this->saveLogs('Execute 12_3');
$this->appendExec('12_3');
case '12_3_1':
$this->saveLogs('Execute 12_3_1');
$this->appendExec('12_3_1');
}
$this->deletePatch();
@@ -761,6 +764,7 @@ class upgradeModel extends model
}
case '12_2': $confirmContent .= file_get_contents($this->getUpgradeFile('12.2'));
case '12_3':
case '12_3_1':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}