Merge branch 'devops23_cyy' into 'devops24'

Fix bug #17048, 20588.

See merge request easycorp/zentaopms!2374

module/install/config.php

@@ -0,0 +1,3 @@
+<?php
+$config->install = new stdclass();
+$config->install->step5RequiredFields = 'company,account,password';

module/install/lang/en.php

@@ -157,7 +157,10 @@ $lang->install->getPriv            = 'Set Admin';
 $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->errorEmpty['company']  = "{$lang->install->company} should not be blank.";
+$lang->install->errorEmpty['account']  = "{$lang->install->account} should not be blank.";
+$lang->install->errorEmpty['password'] = "{$lang->install->password} should not be blank.";
 
 $lang->install->processList['11'] = 'Project management';
 $lang->install->processList['12'] = 'Project planning';

module/install/lang/zh-cn.php

@@ -157,7 +157,10 @@ $lang->install->getPriv            = '设置帐号';
 $lang->install->company            = '公司名称';
 $lang->install->account            = '管理员帐号';
 $lang->install->password           = '管理员密码';
-$lang->install->errorEmptyPassword = '密码不能为空';
+
+$lang->install->errorEmpty['company']  = "{$lang->install->company}不能为空";
+$lang->install->errorEmpty['account']  = "{$lang->install->account}不能为空";
+$lang->install->errorEmpty['password'] = "{$lang->install->password}不能为空";
 
 $lang->install->processList['11'] = '立项管理';
 $lang->install->processList['12'] = '项目规划';

module/install/model.php

@@ -502,13 +502,21 @@ class installModel extends model
      */
     public function grantPriv()
     {
-        if($this->post->password == '') return print(js::error($this->lang->install->errorEmptyPassword));
+        $requiredFields = explode(',', $this->config->install->step5RequiredFields);
+        foreach($requiredFields as $field)
+        {
+            if(empty($this->post->{$field}))
+            {
+                dao::$errors[] = $this->lang->install->errorEmpty[$field];
+                return false;
+            }
+        }
 
         /* Insert a company. */
         $company = new stdclass();
         $company->name   = $this->post->company;
         $company->admins = ",{$this->post->account},";
-        $this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name', 'notempty')->exec();
+        $this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->exec();
         if(!dao::isError())
         {
             /* Set admin. */
@@ -518,7 +526,7 @@ class installModel extends model
             $admin->password = md5($this->post->password);
             $admin->gender   = 'f';
             $admin->visions  = 'rnd,lite';
-            $this->dao->replace(TABLE_USER)->data($admin)->check('account', 'notempty')->exec();
+            $this->dao->replace(TABLE_USER)->data($admin)->exec();
         }
     }
 

module/upgrade/lang/en.php

@@ -87,7 +87,8 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <h4>2. Independent {$lang->projectCommon}</h4>
 <p>Choose several {$lang->projectCommon}s and migrate them to one Program, or migrate them separately.</p>
 <h4>4. Link {$lang->projectCommon}s of several {$lang->productCommon}s</h4>
-<p>You can set {$lang->projectCommon}s as one new project.</p>
+<p>After selecting a historical {$lang->projectCommon} as a project upgrade, the user can select the program to which this project belongs or create a new program.</p>
+<p>After selecting a historical {$lang->projectCommon} as the iterative upgrade, the user can select the project and program to which the execution belongs or create a new project and program.</p>
 EOD;
 
 $lang->upgrade->to15Mode['classic'] = 'Keep the classic mode';

module/upgrade/lang/zh-cn.php

@@ -87,7 +87,8 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <h4>情况三：独立的{$lang->projectCommon}</h4>
 <p>可以选择若干个{$lang->projectCommon}迁移到一个项目集中，也可以独立迁移。</p>
 <h4>情况四：关联多个{$lang->productCommon}的{$lang->projectCommon}</h4>
-<p>可以选择这些{$lang->projectCommon}归属于某个新项目下。</p>
+<p>选择历史{$lang->projectCommon}作为项目升级后，用户可以选择这个项目所属的项目集或新建项目集。</p>
+<p>选择历史{$lang->projectCommon}作为迭代升级后，用户可以选择这个执行所属的项目集、项目或新建项目集、项目。</p>
 EOD;
 
 $lang->upgrade->to15Mode['classic'] = '经典管理模式';