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

module/doc/view/content.html.php

@@ -296,7 +296,7 @@
 $(function()
 {
     var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false});
-    simplemde.value(String(markdownText));
+    //simplemde.value(String(markdownText));
     simplemde.togglePreview();
 
     $('#content .CodeMirror .editor-preview a').attr('target', '_blank');

module/doc/view/view.html.php

@@ -249,7 +249,7 @@ js::set('docID', $doc->id);
 $(function()
 {
     var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false});
-    simplemde.value(String(markdownText));
+    //simplemde.value(String(markdownText));
     simplemde.togglePreview();
 
     $('#content .CodeMirror .editor-preview a').attr('target', '_blank');

module/execution/lang/zh-cn.php

@@ -351,8 +351,8 @@ $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.net/goto.p
 $lang->execution->whyNoStories         = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->projectNoStories     = "看起来没有{$lang->SRCommon}可以关联。请检查下项目中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->productStories       = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
-$lang->execution->haveBranchDraft      = "有%s条非激活状态或不是{$lang->executionCommon}关联分支的{$lang->SRCommon}无法导入";
-$lang->execution->haveDraft            = "有%s条非激活状态的{$lang->SRCommon}无法导入";
+$lang->execution->haveBranchDraft      = "导入完成！有%s条非激活状态或不是{$lang->executionCommon}关联分支的{$lang->SRCommon}无法导入";
+$lang->execution->haveDraft            = "导入完成！有%s条非激活状态的{$lang->SRCommon}无法导入";
 $lang->execution->doneExecutions       = '已结束';
 $lang->execution->selectDept           = '选择部门';
 $lang->execution->selectDeptTitle      = '选择一个部门的成员';

module/execution/view/create.html.php

@@ -134,7 +134,7 @@
         <?php $i = 0;?>
         <?php foreach($products as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php echo $lang->project->manageProductPlan;?></th>
+          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6">
@@ -149,7 +149,7 @@
                   <div class='table-col <?php if(!$hasBranch) echo 'hidden';?>'>
                     <div class='input-group required'>
                       <span class='input-group-addon fix-border'><?php echo $lang->project->branch;?></span>
-                      <?php $branchIdList = join(',', $product->branches);?>
+                      <?php $branchIdList = isset($product->branches) ? join(',', $product->branches) : '';?>
                       <?php echo html::select("branch[$i][]", isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
                     </div>
                   </div>
@@ -158,7 +158,7 @@
               <div class="col-sm-6">
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
-                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
+                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), isset($product->plans) ? $product->plans : '', "class='form-control chosen' multiple");?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>

module/my/view/requirement.html.php

@@ -76,7 +76,7 @@
       <tbody>
         <?php foreach($stories as $story):?>
         <?php
-        $storyLink    = $this->createLink('story', 'view', "id=$story->id");
+        $storyLink    = $this->createLink('story', 'view', "id=$story->id&version=0&param=0&storyType=requirement");
         $canBeChanged = common::canBeChanged('story', $story);
         $spanClass    = $canBatchAction ? 'c-span' : '';
         ?>

module/product/control.php

@@ -249,7 +249,7 @@ class product extends control
         $showBranch = $this->loadModel('branch')->showBranch($productID);
 
         /* Get stories. */
-        if($isProjectStory)
+        if($isProjectStory and $storyType == 'story')
         {
             $showBranch = $this->loadModel('branch')->showBranch($productID, 0, $projectID);
 

module/productplan/css/view.css

@@ -33,3 +33,6 @@ ol, ul {padding-left: 20px;}
 #mainMenu .btn-toolbar .page-title .text {max-width: 434px; overflow: hidden; white-space:nowrap; margin-right: 6px;}
 #actionsBox a:last-of-type + .divider {display: none;}
 #actionsBox div.divider:first-child {display: none;}
+
+#bugs th.c-pri, #bugs th.c-actions {width:72px !important;}
+#bugs th.c-status, #bugs th.c-user {width:120px !important;}

module/productplan/view/browsebylist.html.php

@@ -84,7 +84,7 @@
         <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->productplan->status);?></th>
         <?php endif;?>
         <?php if($this->session->currentProductType != 'normal'):?>
-        <th class='c-branch'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->productplan->branch);?></th>
+        <th class='c-branch'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branchName[$product->type]);?></th>
         <?php endif;?>
         <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
         <th class='c-date'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->productplan->end);?></th>

module/productplan/view/view.html.php

@@ -124,8 +124,8 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
                 <?php else:?>
                 <th class='c-id text-left'>
@@ -139,15 +139,15 @@
                 <?php if($canOrder):?>
                 <th class='w-70px'><?php common::printOrderLink('order', $orderBy, $vars, $lang->productplan->updateOrder);?></th>
                 <?php endif;?>
-                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-                <th class='w-150px text-left'><?php common::printOrderLink('module',     $orderBy, $vars, $lang->story->module);?></th>
-                <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-                <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-                <th class='w-70px text-right'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-                <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-                <th class='w-80px'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='c-actions-1'> <?php echo $lang->actions?></th>
+                <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
+                <th class='w-150px text-left'><?php common::printOrderLink('module', $orderBy, $vars, $lang->story->module);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+                <th class='c-user'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+                <th class='w-70px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                <th class='w-80px'><?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
+                <th class='c-actions-1'><?php echo $lang->actions?></th>
                 <?php endif;?>
               </tr>
             </thead>
@@ -165,13 +165,13 @@
                 <td class='c-id text-left'>
                 <?php printf('%03d', $story->id);?>
                 </td>
-                <td><span class="<?php echo $story->pri ? 'label-pri label-pri-' . $story->pri : "";?>" title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
                 <td class='text-left nobr' title='<?php echo $story->title?>'>
                   <?php
                   if($story->parent > 0) echo "<span class='label label-badge label-light' title={$lang->story->children}>{$lang->story->childrenAB}</span>";
                   echo $story->title;
                   ?>
                 </td>
+                <td><span class="<?php echo $story->pri ? 'label-pri label-pri-' . $story->pri : "";?>" title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status?>'>
                     <?php echo $this->processStatus('story', $story);?>
@@ -186,22 +186,20 @@
                   <?php endif;?>
                 </td>
                 <?php if($canOrder):?><td class='sort-handler'><i class='icon-move'></i></td><?php endif;?>
-                <td><span class="<?php echo $story->pri ? 'label-pri label-pri-' . $story->pri : "";?>" title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo zget($modulePairs, $story->module, '');?>'><?php echo zget($modulePairs, $story->module, '');?></td>
                 <td class='text-left nobr' title='<?php echo $story->title?>'>
                   <?php
                   if($story->parent > 0) echo "<span class='label label-badge label-light' title={$lang->story->children}>{$lang->story->childrenAB}</span>";
                   echo html::a($viewLink , $story->title, '', "style='color: $story->color' data-app={$this->app->tab}");
                   ?>
                 </td>
+                <td class='text-left nobr' title='<?php echo zget($modulePairs, $story->module, '');?>'><?php echo zget($modulePairs, $story->module, '');?></td>
+                <td><span class="<?php echo $story->pri ? 'label-pri label-pri-' . $story->pri : "";?>" title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
+                <td>
+                  <span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span>
+                </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
                 <td><?php echo zget($users, $story->assignedTo);?></td>
                 <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
-                <td>
-                  <span class='status-story status-<?php echo $story->status?>'>
-                    <?php echo $this->processStatus('story', $story);?>
-                  </span>
-                </td>
                 <td><?php echo $lang->story->stageList[$story->stage];?></td>
                 <td class='c-actions'>
                   <?php
@@ -419,8 +417,8 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-100px'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
                 <?php else:?>
                 <th class='c-id text-left'>
@@ -431,12 +429,12 @@
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-                <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
+                <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
+                <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+                <th class='c-status'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->bug->status);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedToAB);?></th>
-                <th class='w-100px'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
-                <th class='w-50px'> <?php echo $lang->actions?></th>
+                <th class='c-actions'> <?php echo $lang->actions?></th>
                 <?php endif;?>
               </tr>
             </thead>
@@ -447,12 +445,10 @@
                 <td class='c-id text-left'>
                   <?php printf('%03d', $bug->id);?>
                 </td>
-                <td><span class='<?php echo $bug->pri ? "label-pri label-pri-{$bug->pri}" : "";?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
                 <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
+                <td><span class='<?php echo $bug->pri ? "label-pri label-pri-{$bug->pri}" : "";?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
                 <td>
-                  <span class='status-bug status-<?php echo $bug->status?>'>
-                    <?php echo $this->processStatus('bug', $bug);?>
-                  </span>
+                  <span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span>
                 </td>
                 <?php else:?>
                 <td class='c-id text-left'>
@@ -462,15 +458,13 @@
                   <?php printf('%03d', $bug->id);?>
                   <?php endif;?>
                 </td>
-                <td><span class='<?php echo $bug->pri ? "label-pri label-pri-{$bug->pri}" : "";?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
                 <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "data-app={$this->app->tab}");?></td>
+                <td><span class='<?php echo $bug->pri ? "label-pri label-pri-{$bug->pri}" : "";?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
+                <td>
+                  <span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span>
+                </td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
-                <td>
-                  <span class='status-bug status-<?php echo $bug->status?>'>
-                    <?php echo $this->processStatus('bug', $bug);?>
-                  </span>
-                </td>
                 <td class='c-actions'>
                   <?php
                   if($canBeChanged and common::hasPriv('productplan', 'unlinkBug'))

module/project/view/build.html.php

@@ -50,9 +50,9 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
           <?php if($project->hasProduct):?>
-          <th class="c-name w-150px text-left"><?php echo $lang->build->product;?></th>
+          <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
           <?php if($showBranch):?>
-          <th class="c-name w-200px text-left"><?php echo $lang->build->branch;?></th>
+          <th class="c-name w-150px text-left"><?php echo $lang->build->branch;?></th>
           <?php endif;?>
           <?php endif;?>
           <?php if($project->multiple):?>

module/story/js/create.js

@@ -132,6 +132,7 @@ $(window).unload(function(){
  */
  function addBranchesBox(obj)
  {
+    $('#storyNoticeBranch').closest('tr').removeClass('hidden');
     if($(".table-form select[id^='branches']").length == $('.switchBranch #branchBox option').length) return false;
 
     var selectedVal = [];
@@ -193,6 +194,7 @@ $(window).unload(function(){
 
      $('.icon-plus').parent().css('pointer-events', 'auto')
      $('.icon-plus').parent().removeClass('disabled')
+     if($('select[name^="branches"]').length == 2) $('#storyNoticeBranch').closest('tr').addClass('hidden');
  }
 
  /**

module/story/view/create.html.php

@@ -115,7 +115,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
               </div>
             </td>
           </tr>
-          <tr class='<?php if(!$branches) echo "hidden"; ?> switchBranch' >
+          <tr class='hidden switchBranch' >
             <th></th>
             <td colspan="4" id="storyNoticeBranch">
               <i class="icon-exclamation-sign"></i> <?php echo $lang->story->notice->branch;?>