Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/upgrade/control.php

@@ -493,8 +493,6 @@ class upgrade extends control
         if(empty($repos))
         {
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
-
-            if($this->config->version == $this->config->installedVersion) die(js::alert($this->lang->upgrade->successTip) . js::locate($this->createLink('user', 'logout')));
             die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
         }
 

module/upgrade/lang/en.php

@@ -52,7 +52,7 @@ $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
-$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0.beta1 upgrade';
+$lang->upgrade->to15Guide     = 'ZenTao open source version 15.0 upgrade';
 $lang->upgrade->to15Desc      = <<<EOD
 <p>Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:</p>
 <ol>

module/upgrade/lang/version.php

@@ -132,3 +132,4 @@ $lang->upgrade->fromVersions['12_4_4']     = '12.4.4';
 $lang->upgrade->fromVersions['12_5']       = '12.5';
 $lang->upgrade->fromVersions['12_5_1']     = '12.5.1';
 $lang->upgrade->fromVersions['12_5_2']     = '12.5.2';
+$lang->upgrade->fromVersions['12_5_3']     = '12.5.3';

module/upgrade/lang/zh-cn.php

@@ -53,7 +53,7 @@ $lang->upgrade->noticeSQL      = '检查到你的数据库跟标准不一致，
 $lang->upgrade->afterDeleted   = '以上文件未能删除， 删除后刷新！';
 $lang->upgrade->mergeProgram   = '数据迁移';
 $lang->upgrade->mergeTips      = '数据迁移提示';
-$lang->upgrade->to15Guide      = '禅道开源版15.0.beta1升级';
+$lang->upgrade->to15Guide      = '禅道开源版15版本升级';
 $lang->upgrade->to15Desc       = <<<EOD
 <p>尊敬的用户，禅道从15版本开始对导航和概念做了调整，主要改动如下：</p>
 <ol>

module/upgrade/model.php

@@ -632,17 +632,15 @@ class upgradeModel extends model
         case '12_5_2':
             $this->saveLogs('Execute 12_5_2');
             $this->appendExec('12_5_2');
+        case '12_5_3':
+            $this->saveLogs('Execute 12_5_3');
+            $this->appendExec('12_5_3');
         case '15_0':
             $this->saveLogs('Execute 15_0');
             $this->execSQL($this->getUpgradeFile('15.0'));
             $this->adjustWhitelistOfProject();
             $this->adjustWhitelistOfProduct();
             $this->appendExec('15_0');
-        case '15_0_beta1':
-            $this->saveLogs('Execute 15_0_beta1');
-            $this->adjustBugOfProject();
-            $this->adjustPriv15_0();
-            $this->appendExec('15_0_beta1');
         }
 
         $this->deletePatch();
@@ -826,6 +824,7 @@ class upgradeModel extends model
             case '12_5':
             case '12_5_1':
             case '12_5_2':
+            case '12_5_3':
             case '15_0'  : $confirmContent .= file_get_contents($this->getUpgradeFile('15.0'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -4327,7 +4326,7 @@ class upgradeModel extends model
             $data->path     = ",{$projectID},{$sprint->id},";
             $data->type     = 'sprint';
             $data->acl      = $sprint->acl == 'custom' ? 'private' : $sprint->acl;
-            $data->lifetime = $sprint->type;
+            $data->lifetime = empty($sprint->lifetime) ? $sprint->type : $sprint->lifetime;
 
             $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($sprint->id)->exec();
         }

module/upgrade/view/createprogram.html.php

@@ -89,7 +89,7 @@
   </tr>
   <tr class='programParams'>
     <th><?php echo $lang->project->acl;?></th>
-    <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, 'open', '', 'block'));?></td>
+    <td><?php echo nl2br(html::radio('acl', $lang->program->subAclList, 'open', '', 'block'));?></td>
   </tr>
 </table>
 <div class='table-foot text-center'><?php echo html::submitButton();?></div>