diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 455e0e09d0..6b1d4542e8 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -44,6 +44,7 @@ class upgrade extends control public function to20() { $this->view->title = $this->lang->upgrade->to20Tips; + $this->view->video = $this->app->getWebRoot() . 'data/video/zentao20.mp4'; $this->display(); } @@ -290,7 +291,7 @@ class upgrade extends control $this->upgrade->setDefaultPriv(); $this->loadModel('setting')->deleteItems('owner=system&module=common§ion=global&key=upgradeStep'); $this->dao->update(TABLE_CONFIG)->set('value')->eq('0_0')->where('`key`')->eq('productProject')->exec(); - die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=yes"))); + die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no"))); } $this->view->noMergedProductCount = $noMergedProductCount; diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css index 95e5fa0114..abdebdab7c 100644 --- a/module/upgrade/css/afterexec.css +++ b/module/upgrade/css/afterexec.css @@ -1,7 +1,7 @@ .adbox{margin-bottom:0px; border:0px; box-shadow:none;} .adbox .panel-body{padding-bottom:0px; border:0px;} -.col-md-6{width:100% !important;} +.col-md-6{width:49% !important;} .row .divider{ display: block; width: 2px; height: 450px; background-color: rgba(0,0,0,.05); float: left;} .row .col-md-6 .message{padding-left:50px; padding-top:50px;} diff --git a/module/upgrade/view/to20.html.php b/module/upgrade/view/to20.html.php index 5d02878458..e4fdfed433 100644 --- a/module/upgrade/view/to20.html.php +++ b/module/upgrade/view/to20.html.php @@ -16,7 +16,10 @@