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

framework/base/router.class.php

@@ -852,7 +852,7 @@ class baseRouter
         if(!defined('SESSION_STARTED'))
         {
             /* If request header has token, use it as session for authentication. */
-            if(isset($_SERVER['HTTP_AUTHORIZATION'])) session_id($_SERVER['HTTP_AUTHORIZATION']);
+            if(isset($_SERVER['HTTP_TOKEN'])) session_id($_SERVER['HTTP_TOKEN']);
 
             $sessionName = $this->config->sessionVar;
             session_name($sessionName);

module/bug/view/create.html.php

@@ -26,7 +26,6 @@ js::set('isStepsTemplate', $isStepsTemplate);
 js::set('oldProjectID', $projectID);
 js::set('blockID', $blockID);
 js::set('moduleID', $moduleID);
-js::set('gitlabProjects', $gitlabProjects);
 ?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
@@ -313,13 +312,6 @@ js::set('gitlabProjects', $gitlabProjects);
              <?php endif;?>
           </tr>
           <?php endif;?>
-          <?php if(!empty($gitlabProjects)):?>
-          <tr>
-            <th><?php echo $lang->task->sync2Gitlab;?></th>
-            <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
-            <td><?php echo html::select('gitlabProject', '', '', "class='form-control chosen'");?></td>
-          </tr>
-          <?php endif;?>
           <tr class='hide'>
             <th><?php echo $lang->bug->status;?></th>
             <td><?php echo html::hidden('status', 'active');?></td>

module/custom/control.php

@@ -551,10 +551,12 @@ class custom extends control
             if($mode == 'new')
             {
                 if($sprintConcept == 2) $this->setting->setItem('system.custom.sprintConcept', 1);
+                if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 0);
                 die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent'));
             }
             else
             {
+                if($sprintConcept == 0) $this->setting->setItem('system.custom.sprintConcept', 1);
                 if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 2);
                 die(js::reload('top'));
             }

module/custom/model.php

@@ -691,6 +691,7 @@ class customModel extends model
     {
         $this->loadModel('setting');
         $this->setting->setItem('system.custom.sprintConcept', $this->post->sprintConcept);
+        $this->setting->setItem('system.custom.productProject', '0_' . $this->post->sprintConcept);
 
         /* Change block title. */
         $oldConfig = isset($this->config->custom->sprintConcept) ? $this->config->custom->sprintConcept : '0';

module/story/view/create.html.php

@@ -17,7 +17,6 @@
 </style>
 <?php js::set('holders', $lang->story->placeholder); ?>
 <?php js::set('blockID', $blockID); ?>
-<?php js::set('gitlabProjects', $gitlabProjects);?>
 <?php if(common::checkNotCN()):?>
 <style> .sourceTd > .input-group > .input-group > .input-group-addon:first-child{padding: 5px 18px} </style>
 <?php endif;?>
@@ -252,13 +251,6 @@
             </td>
           </tr>
           <?php endif;?>
-          <?php if(!empty($gitlabProjects)):?>
-          <tr>
-            <th><?php echo $lang->story->sync2Gitlab;?></th>
-            <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
-            <td><?php echo html::select('gitlabProject', '', '', "class='w-50px form-control chosen'");?></td>
-          </tr>
-          <?php endif;?>
         </tbody>
         <tfoot>
           <tr>

module/task/model.php

@@ -1130,6 +1130,7 @@ class taskModel extends model
             $task->lastEditedBy   = $this->app->user->account;
             $task->lastEditedDate = $now;
             $task->consumed       = $oldTask->consumed;
+            $task->parent         = $oldTask->parent;
 
             if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline)
             {
@@ -1257,7 +1258,7 @@ class taskModel extends model
                 ->checkIF($task->estimate != false, 'estimate', 'float')
                 ->checkIF($task->consumed != false, 'consumed', 'float')
                 ->checkIF($task->left     != false, 'left',     'float')
-                ->checkIF($task->left     == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done')
+                ->checkIF($task->parent > 0 and $task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done')
 
                 ->batchCheckIF($task->status == 'wait' or $task->status == 'doing', 'finishedBy, finishedDate,canceledBy, canceledDate, closedBy, closedDate, closedReason', 'empty')
 

module/task/view/create.html.php

@@ -15,7 +15,6 @@
 <?php include '../../common/view/sortable.html.php';?>
 <?php js::set('toTaskList', !empty($task->id));?>
 <?php js::set('blockID', $blockID);?>
-<?php js::set('gitlabProjects', $gitlabProjects);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -80,13 +79,13 @@
         <?php if(strpos(",$showFields,", ',story,') !== false and $execution->type != 'ops'):?>
         <tr>
           <th><?php echo $lang->task->story;?></th>
-          <td colspan='3'>           
-            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span> 
+          <td colspan='3'>
+            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
             <div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
               <?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
               <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
             </div>
-            
+
           </td>
         </tr>
         <?php endif;?>
@@ -240,13 +239,6 @@
           </td>
         </tr>
         <?php endif;?>
-        <?php if(!empty($gitlabProjects)):?>
-        <tr>
-          <th><?php echo $lang->task->sync2Gitlab;?></th>
-          <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
-          <td><?php echo html::select('gitlabProject', '', '', "class='w-50px form-control chosen'");?></td>
-        </tr>
-        <?php endif;?>
         <tr id='after-tr'>
           <th><?php echo $lang->task->afterSubmit;?></th>
           <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, !empty($task->id) ? 'toTaskList' : 'continueAdding');?></td>

module/upgrade/view/mergebyline.html.php

@@ -35,7 +35,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>

module/upgrade/view/mergebyproduct.html.php

@@ -16,7 +16,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>

module/upgrade/view/mergebysprint.html.php

@@ -9,7 +9,7 @@
     <div class='cell'>
       <div class='lineGroup-title'>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups sprintGroup'>

module/upgrade/view/mergeprogram.html.php

@@ -35,7 +35,7 @@
         <table class='table table-hover table-form'>
           <thead>
             <tr>
-              <th><?php echo $lang->executionCommon;?></th>
+              <th><?php echo $lang->projectCommon;?></th>
               <th class='divider'></th>
               <th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
             </tr>