diff --git a/module/install/control.php b/module/install/control.php index 5a835e187f..c66c9de8fd 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -384,9 +384,7 @@ class install extends control $this->install->enableCache(); - $skipApp = (string)getenv('ZT_SKIP_DEVOPS_INIT'); - $link = ($this->config->inQuickon && (!$skipApp || $skipApp == 'false')) ? inlink('app') : inlink('step6'); - return $this->send(array('result' => 'success', 'load' => $link)); + return $this->send(array('result' => 'success', 'load' => inlink('step6'))); } if($this->config->inQuickon) $this->installZen->saveConfigFile(); @@ -452,39 +450,6 @@ class install extends control $this->display(); } - /** - * 安装devops相关应用。 - * Install apps of devops. - * - * @access public - * @return void - */ - public function app() - { - $this->loadModel('common'); - $this->loadModel('solution'); - $cloudSolution = $this->loadModel('store')->getSolution('name', 'devops'); - $components = $this->loadModel('store')->solutionConfig('name', 'devops'); - - if($_POST) - { - $solution = $this->solution->create($cloudSolution, $components); - if(dao::isError()) $this->send(array('result' => 'failure', 'message' => dao::getError())); - - $this->send(array('result' => 'success', 'data' => $solution, 'locate' => $this->inLink('progress', "id={$solution->id}&install=true"))); - } - - $category = helper::arrayColumn($components->category, 'name'); - $category = array_filter($category, function($cate){return $cate !== 'pms';}); - - $this->view->title = $this->lang->solution->install; - $this->view->cloudSolution = $cloudSolution; - $this->view->components = $this->installZen->processComponents($components, $cloudSolution); - $this->view->category = $category; - - $this->display(); - } - /** * 展示应用安装进度。 * Show installation progress of solution. diff --git a/module/install/ui/app.html.php b/module/install/ui/app.html.php deleted file mode 100644 index b6ce20c8b8..0000000000 --- a/module/install/ui/app.html.php +++ /dev/null @@ -1,75 +0,0 @@ - - * @package install - * @link https://www.zentao.net - */ -namespace zin; - -set::zui(true); - -$formRows = array(); -foreach($components->category as $item) -{ - $formRows[] = formGroup - ( - set::label($item->alias), - set::name($item->name), - set::required(true), - set::items($item->schemaChoices), - on::change('checkMemory(this)') - ); -} - -jsVar('category', $category); -div -( - setID('main'), - setClass('flex justify-center'), - div - ( - setID('mainContent'), - setClass('px-1 mt-2 w-full max-w-7xl'), - formPanel - ( - set::formID('solutionForm'), - setClass('bg-canvas m-auto mw-auto'), - set::title($lang->install->solution->title), - set::submitBtnText($lang->solution->install), - set::formClass('w-1/2 m-auto'), - set('data-loading', $lang->solution->notices->creatingSolution), - div - ( - setClass('text-center'), - $lang->install->solution->desc - ), - $formRows, - div - ( - setClass('hidden text-center text-warning'), - setID('overMemoryNotice'), - $lang->install->solution->overMemory - ), - set::actions(array( - array( - 'text' => $lang->install->solution->skip, - 'href' => createLink('install', 'step6'), - 'id' => 'skipBtn', - 'class' => 'btn hidden' - ), - array( - 'text' => $lang->solution->install, - 'id' => 'submitBtn', - 'class' => 'btn primary', - 'onclick' => 'checkSolution(this)' - ) - )) - ) - ) -); - -render('pagebase');