From 0cbd7bd2b81dfae07b9359ffeb1edbe17637c58a Mon Sep 17 00:00:00 2001 From: zenggang Date: Mon, 12 Jul 2021 01:37:50 +0000 Subject: [PATCH] finish task #40019 --- module/custom/control.php | 9 ++++++--- module/custom/view/header.html.php | 6 +++--- module/custom/view/mode.html.php | 4 ++-- module/install/control.php | 3 +++ module/install/lang/de.php | 2 ++ module/install/lang/en.php | 2 ++ module/install/lang/fr.php | 2 ++ module/install/lang/vi.php | 2 ++ module/install/lang/zh-cn.php | 2 ++ module/install/lang/zh-tw.php | 2 ++ module/install/view/step4.html.php | 12 ++++++++++++ 11 files changed, 38 insertions(+), 8 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index b7792f4b73..3547880f71 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -540,24 +540,27 @@ class custom extends control */ public function mode() { - if($this->post->mode == 'new') + $mode = zget($this->config->global, 'mode', 'classic'); + if($this->post->mode && $this->post->mode != $mode) // if mode value change { $mode = fixer::input('post')->get('mode'); $this->loadModel('setting')->setItem('system.common.global.mode', $mode); if($mode == 'new') die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent')); + if($mode == 'classic') die(js::reload('top')); } - $mode = zget($this->config->global, 'mode', 'classic'); + if($mode == 'new') { if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') die(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent')); unset($_SESSION['upgrading']); - $this->locate(inlink('index')); + // $this->locate(inlink('index')); } $this->app->loadLang('upgrade'); + $this->view->mode = $mode; $this->view->title = $this->lang->custom->mode; $this->view->position[] = $this->lang->custom->common; $this->view->position[] = $this->view->title; diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php index 3b19374421..6c4edddc41 100644 --- a/module/custom/view/header.html.php +++ b/module/custom/view/header.html.php @@ -15,10 +15,10 @@ if($sysObject == 'required') continue; common::printLink('custom', $sysObject, "", "{$lang->custom->$sysObject}", '', "class='btn btn-link' id='{$sysObject}Tab'"); } - if((isset($config->systemMode) and $config->systemMode == 'classic') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram')) - { + // if((isset($config->systemMode) and $config->systemMode == 'classic') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram')) + // { common::printLink('custom', 'mode', "", "{$lang->custom->mode}", '', "class='btn btn-link' id='modeTab'"); - } + // } ?> diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index dba96a1fd2..c8d917e511 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -23,8 +23,8 @@ custom->mode;?>

- - + +

upgrade->selectedModeTips['new'];?>

diff --git a/module/install/control.php b/module/install/control.php index 896c8f245d..8381d2542a 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -183,12 +183,15 @@ class install extends control if(dao::isError()) echo js::alert($this->lang->install->errorImportDemoData); $this->loadModel('setting')->updateVersion($this->config->version); + $this->loadModel('setting')->setItem('system.common.global.mode', $this->post->mode); // update mode $this->loadModel('setting')->setItem('system.common.global.flow', $this->post->flow); $this->loadModel('setting')->setItem('system.common.safe.mode', '1'); $this->loadModel('setting')->setItem('system.common.safe.changeWeak', '1'); $this->loadModel('setting')->setItem('system.common.global.cron', 1); die(js::locate(inlink('step5'), 'parent')); } + + $this->app->loadLang('upgrade'); $this->view->title = $this->lang->install->getPriv; if(!isset($this->config->installed) or !$this->config->installed) diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 2edf559a0c..dc51099b6a 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -128,6 +128,8 @@ $lang->install->company = 'Firmenname'; $lang->install->account = 'Admin Konto'; $lang->install->password = 'Admin Passwort'; $lang->install->errorEmptyPassword = 'Passwort sollte nicht leer sein.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'Later, you can go to the background - Custom - mode to adjust'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'System Administrator'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 2a1621b5a5..5abfbe4b9d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -128,6 +128,8 @@ $lang->install->company = 'Company Name'; $lang->install->account = 'Admin Account'; $lang->install->password = 'Admin Password'; $lang->install->errorEmptyPassword = 'Password should not be blank.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'Later, you can go to the background - Custom - mode to adjust'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'System Admin'; diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index fd790bb11b..c3cd97619c 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -128,6 +128,8 @@ $lang->install->company = 'Nom Entreprise'; $lang->install->account = 'Compte Admin'; $lang->install->password = 'Mot de Passe Admin'; $lang->install->errorEmptyPassword = 'Password ne doit pas être vide.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'Later, you can go to the background - Custom - mode to adjust'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'Administrateur'; diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php index fac01d4bf8..fb0c748a1c 100644 --- a/module/install/lang/vi.php +++ b/module/install/lang/vi.php @@ -128,6 +128,8 @@ $lang->install->company = 'Tên doanh nghiệp'; $lang->install->account = 'Tài khoản quản trị'; $lang->install->password = 'Mật khẩu quản trị'; $lang->install->errorEmptyPassword = 'Mật khẩu không nên là blank.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'Later, you can go to the background - Custom - mode to adjust'; $lang->install->groupList['ADMIN']['name'] = 'Quản trị'; $lang->install->groupList['ADMIN']['desc'] = 'Quản trị hệ thống'; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 109d7f100a..6ee144914f 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -128,6 +128,8 @@ $lang->install->company = '公司名称'; $lang->install->account = '管理员帐号'; $lang->install->password = '管理员密码'; $lang->install->errorEmptyPassword = '密码不能为空'; +$lang->install->selectedMode = '选择模式'; +$lang->install->selectedModeTips = '后续您还可以去后台-自定义-模式中进行调整'; $lang->install->groupList['ADMIN']['name'] = '管理员'; $lang->install->groupList['ADMIN']['desc'] = '系统管理员'; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 53004437ec..08dc11a8ed 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -128,6 +128,8 @@ $lang->install->company = '公司名稱'; $lang->install->account = '管理員帳號'; $lang->install->password = '管理員密碼'; $lang->install->errorEmptyPassword = '密碼不能為空'; +$lang->install->selectedMode = '選擇模式'; +$lang->install->selectedModeTips = '後續您還可以去後臺-自定義-模式中進行調整'; $lang->install->groupList['ADMIN']['name'] = '管理員'; $lang->install->groupList['ADMIN']['desc'] = '系統管理員'; diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index 4d72196d25..6941f737e6 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -62,6 +62,18 @@ install->password;?> + + install->selectedMode;?> + upgrade->to15Mode['classic']) ? 'classic' : 'new';?> + upgrade->to15Mode, $systemMode);?> + + + + + +
install->selectedModeTips;?>
+ + install->importDemoData);?>