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

* Code for task #98106.

Browse Source
This commit is contained in:
tanghucheng
2023-07-20 15:04:30 +08:00
parent 8e806cee21
commit e1f17df3b3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+8 -3
View File
@@ -207,7 +207,11 @@ class upgrade extends control
}
if(version_compare($openVersion, '18_0_beta1', '>=')) $selectMode = false;
if($selectMode) $this->locate(inlink('to18Guide', "fromVersion=$fromVersion"));
if($selectMode)
{
if($this->config->edition == 'ipd') $this->locate(inlink('to18Guide', "fromVersion=$fromVersion&mode=ALM"));
$this->locate(inlink('to18Guide', "fromVersion=$fromVersion"));
}
$this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
}
@@ -224,12 +228,13 @@ class upgrade extends control
* @access public
* @return void
*/
public function to18Guide($fromVersion)
public function to18Guide($fromVersion, $mode = '')
{
if($_POST)
if($_POST or $mode)
{
$mode = fixer::input('post')->get('mode');
$this->loadModel('setting')->setItem('system.common.global.mode', $mode);
if($this->config->edition == 'ipd') $this->loadModel('setting')->setItem('system.common.global.mode', 'PLM');
$this->loadModel('custom')->disableFeaturesByMode($mode);
/* Update sprint concept. */
module/upgrade/model.php
+3 -1
View File
@@ -1160,7 +1160,9 @@ class upgradeModel extends model
case '18_4_beta1':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.4.beta1'));
case '18_4':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.4')); // confirm insert position.
$confirmContent .= file_get_contents($this->getUpgradeFile('18.4'));
case '18_5':
$confirmContent .= file_get_contents($this->getUpgradeFile('ipdinstall')); // confirm insert position.
}
return $confirmContent;