Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/install/view/step4.html.php

@@ -22,7 +22,7 @@
           <h2><?php echo $lang->install->howToUse;?></h2>
           <?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
           <?php if($config->visions == ',lite,'):?>
-          <?php unset($lang->install->modeList['classic'];?>
+          <?php unset($lang->install->modeList['classic']);?>
           <?php $systemMode = 'new';?>
           <?php endif;?>
           <div class='select-mode'><?php echo html::radio('mode', $lang->install->modeList, $systemMode);?></div>

module/project/control.php

@@ -147,6 +147,7 @@ class project extends control
         $projects = $this->dao->select('id, name')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
             ->andWhere('deleted')->eq(0)
+            ->andWhere('vision')->eq($this->config->vision)
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->beginIF(trim($data->name))->andWhere('name')->like("%$data->name%")->fi()
             ->fetchPairs();