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

* Finish task #93603。

Browse Source
This commit is contained in:
hufangzhou
2023-05-29 14:25:37 +08:00
parent 04fa8f0cb6
commit 07642d3c83
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/upgrade/control.php
View File

@@ -96,6 +96,8 @@ class upgrade extends control
$this->config->version = ($this->config->edition == 'biz' ? 'LiteVIP' : 'Lite') . $this->config->liteVersion;
}
if($_POST) return print(js::locate(helper::createLink('upgrade', 'confirm', "fromVersion={$this->post->fromVersion}")));
$this->view->title = $this->lang->upgrade->common . $this->lang->colon . $this->lang->upgrade->selectVersion;
$this->view->position[] = $this->lang->upgrade->common;
$this->view->version = $version;
@@ -105,22 +107,26 @@ class upgrade extends control
/**
* Confirm the version.
*
* @param string $fromVersion
* @access public
* @return void
*/
public function confirm()
public function confirm($fromVersion = '')
{
if(strpos($this->post->fromVersion, 'lite') !== false) $this->post->fromVersion = $this->config->upgrade->liteVersion[$this->post->fromVersion];
$confirmSql = $this->upgrade->getConfirm($this->post->fromVersion);
if(strpos($fromVersion, 'lite') !== false) $fromVersion = $this->config->upgrade->liteVersion[$fromVersion];
$confirmSql = $this->upgrade->getConfirm($fromVersion);
$confirmSql = str_replace('ENGINE=InnoDB', 'ENGINE=MyISAM', $confirmSql);
$this->session->set('step', '');
$this->view->title = $this->lang->upgrade->confirm;
$this->view->position[] = $this->lang->upgrade->common;
$this->view->confirm = $confirmSql;
$this->view->fromVersion = $this->post->fromVersion;
$this->view->fromVersion = $fromVersion;
/* When sql is empty then skip it. */
if(empty($this->view->confirm)) $this->locate(inlink('execute', "fromVersion={$this->post->fromVersion}"));
if(empty($this->view->confirm)) $this->locate(inlink('execute', "fromVersion={$fromVersion}"));
if($_POST) $this->locate(inlink('execute', "fromVersion={$this->post->fromVersion}"));
$this->display();
}
@@ -142,7 +148,7 @@ class upgrade extends control
if($result)
{
$this->view->result = 'fail';
$this->view->errors = $result;
$this->view->errors = $result;
return $this->display();
}

2
module/upgrade/view/confirm.html.php
View File

@@ -11,7 +11,7 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<div class='container'>
<form method='post' onsubmit="submit.disabled=1" action='<?php echo inlink('execute');?>'>
<form method='post' onsubmit="submit.disabled=1">
<div class='modal-dialog'>
<div class='modal-header'>
<strong><?php echo $lang->upgrade->confirm;?></strong>

2
module/upgrade/view/selectversion.html.php
View File

@@ -12,7 +12,7 @@
<?php include '../../common/view/header.lite.html.php';?>
<?php include '../../common/view/chosen.html.php';?>
<div class='container'>
<form method='post' action='<?php echo inlink('confirm');?>'>
<form method='post'>
<div class='modal-dialog'>
<div class='modal-header'>
<strong><?php echo $lang->upgrade->selectVersion;?></strong>