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

2021-05-06 15:52:21 +08:00
parent 36d42a882d 9bd7e77547
commit b864f06de7
9 changed files with 48 additions and 29 deletions
@@ -26,11 +26,11 @@
      <tr>
        <th class='rowhead thWidth'><?php echo $lang->user->account;?></th>
        <td><?php echo $user->account . html::hidden('account',$user->account);?></td>
-      </tr>  
+      </tr>
      <tr>
        <th><?php echo $lang->user->originalPassword;?></th>
        <td><?php echo html::password('originalPassword', '', "class='form-control'");?></td>
-      </tr>  
+      </tr>
      <tr>
        <th><?php echo $lang->user->newPassword;?></th>
        <td>
@@ -39,7 +39,7 @@
            <span class='input-group-addon' id='passwordStrength'></span>
          </span>
        </td>
-      </tr>  
+      </tr>
      <tr>
        <th><?php echo $lang->user->password2;?></th>
        <td><?php echo html::password('password2', '', "class='form-control'");?></td>
@@ -402,24 +402,27 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
                  echo '</div></li>';
              }

-              if($canBatchChangeStage)
+              if($storyType == 'story')
              {
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
-                  echo "<ul class='dropdown-menu'>";
-                  foreach($lang->story->stageList as $key => $stage)
+                  if($canBatchChangeStage)
                  {
-                      if(empty($key)) continue;
-                      if(strpos('tested|verified|released|closed', $key) === false) continue;
-                      $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
-                      echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
+                      echo "<li class='dropdown-submenu'>";
+                      echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'");
+                      echo "<ul class='dropdown-menu'>";
+                      foreach($lang->story->stageList as $key => $stage)
+                      {
+                          if(empty($key)) continue;
+                          if(strpos('tested|verified|released|closed', $key) === false) continue;
+                          $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
+                          echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
+                      }
+                      echo '</ul></li>';
+                  }
+                  else
+                  {
+                      $class= "class='disabled'";
+                      echo "<li $class>" . html::a('javascript:;', $lang->story->stageAB, '', $class) . '</li>';
                  }
-                  echo '</ul></li>';
-              }
-              else
-              {
-                  $class= "class='disabled'";
-                  echo "<li $class>" . html::a('javascript:;', $lang->story->stageAB, '', $class) . '</li>';
              }
              ?>
            </ul>
@@ -3,7 +3,7 @@
 * The create view file of repo module of ZenTaoPMS.
 *
 * @copyright   Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author      Wang Yidong, Zhu Jinyong 
+ * @author      Wang Yidong, Zhu Jinyong
 * @package     repo
 * @version     $Id: create.html.php $
 */
@@ -34,7 +34,7 @@
          </tr>
          <tr class='gitlab hide'>
            <th><?php echo $lang->repo->gitlabHost;?></th>
-            <td><?php echo html::input('gitlabHost', '', "class='form-control' placeholder='{$lang->repo->placeholder}'");?>
+            <td><?php echo html::input('gitlabHost', '', "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
          </tr>
          <tr class='gitlab hide'>
            <th><?php echo $lang->repo->gitlabToken;?></th>
@@ -40,7 +40,7 @@
          </tr>
          <tr class='gitlab hide'>
            <th><?php echo $lang->repo->gitlabHost;?></th>
-            <td><?php echo html::input('gitlabHost', $repo->client, "class='form-control' placeholder='{$lang->repo->placeholder}'");?>
+            <td><?php echo html::input('gitlabHost', $repo->client, "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
          </tr>
          <tr class='gitlab hide'>
            <th><?php echo $lang->repo->gitlabToken;?></th>
@@ -749,7 +749,9 @@ class story extends control
        if($storyType == 'requirement')
        {
            unset($customFields['plan']);
-            $showFields = str_replace('plan', '', $showFields);
+            unset($customFields['stage']);
+            $showFields = str_replace('plan',  '', $showFields);
+            $showFields = str_replace('stage', '', $showFields);
        }
        $this->view->customFields = $customFields;
        $this->view->showFields   = $showFields;
@@ -1907,18 +1909,23 @@ class story extends control
                        unset($stories[$story->id]);
                    }
                }
+
                if(!empty($children))
                {
-                    $position = 0;
+                    $reorderStory = array();
                    foreach($stories as $story)
                    {
-                        $position ++;
+                        $reorderStory[$story->id] = $story;
                        if(isset($children[$story->id]))
                        {
-                            array_splice($stories, $position, 0, $children[$story->id]);
-                            $position += count($children[$story->id]);
+                            foreach($children[$story->id] as $childrenID => $childrenStory)
+                            {
+                                $reorderStory[$childrenID] = $childrenStory;
+                            }
                        }
+                        unset($stories[$story->id]);
                    }
+                    $stories = $reorderStory;
                }
            }

@@ -1068,7 +1068,7 @@ class storyModel extends model
                    if($oldStory->plan != $story->plan) $this->updateStoryOrderOfPlan($storyID, $story->plan, $oldStory->plan);

                    $this->executeHooks($storyID);
-                    $this->batchChangeStage(array($storyID), $story->stage);
+                    if($story->type == 'story') $this->batchChangeStage(array($storyID), $story->stage);
                    if($story->closedReason == 'done') $this->loadModel('score')->create('story', 'close');
                    $allChanges[$storyID] = common::createChanges($oldStory, $story);
                }
@@ -32,7 +32,7 @@
 $visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$visibleFields[$field] = '';
+    if($field and ($storyType == 'story' or $field != 'stage'))$visibleFields[$field] = '';
 }
 ?>
 <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "productID=$productID&executionID=$executionID")?>" id="batchEditForm">
@@ -194,7 +194,15 @@ $(document).on('mousedown', 'select', function()
 $(function()
 {
    /* Adjust width for ie chosen width. */
-    var chosenWidth = $('#module1_chosen').width();
+    if(!hiddenStory)
+    {
+        var chosenWidth = $('#module1_chosen').width();
+    }
+    else
+    {
+        var chosenWidth = 170;
+    }
+
    $('.chosen-container[id^=module]').width(chosenWidth);
    $('.chosen-container[id^=module]').css('max-width', chosenWidth);

@@ -200,5 +200,6 @@
 <?php js::set('mainField', 'name');?>
 <?php js::set('ditto', $lang->task->ditto);?>
 <?php js::set('storyID', $storyID);?>
+<?php js::set('hiddenStory', $hiddenStory);?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>