Merge branch 'tianshujie_fixbug' into 'master'

Tianshujie fixbug

See merge request easycorp/zentaopms!6260

module/block/view/waterfallganttblock.html.php

@@ -124,7 +124,7 @@
         {
             plan.progress = !plan.tasks.length ? 0 : plan.progress / plan.tasks.length;
             var $plan = $('<div class="gantt-plan"></div>');
-            $plan.append('<div class="strong" title="' + plan.text + '">' + plan.text + '</div>');
+            $plan.append('<div class="strong" title="' + plan.name + '">' + plan.text + '</div>');
             $plans.append($plan);
 
             var $bar = $('<div class="gantt-bar"></div>');

module/design/view/linkcommit.html.php

@@ -74,7 +74,9 @@
       </tbody>
     </table>
     <div class='table-footer'>
+      <?php if(!empty($revisions)):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <?php endif;?>
       <div class="table-actions btn-toolbar">
         <?php echo html::submitButton('', '', 'btn btn-primary')?>
       </div>

module/execution/view/story.html.php

@@ -184,9 +184,6 @@
   </div>
   <div class="main-col">
     <div id='queryBox' data-module='executionStory' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
-      <div class="table-header fixed-right">
-        <nav class="btn-toolbar pull-right setting"></nav>
-      </div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
@@ -217,6 +214,9 @@
       </p>
     </div>
     <?php else:?>
+    <div class="table-header fixed-right">
+      <nav class="btn-toolbar pull-right setting"></nav>
+    </div>
     <form class='main-table table-story skip-iframe-modal' method='post' id='executionStoryForm'>
       <?php
       $datatableId  = $this->moduleName . ucfirst($this->methodName);

module/programplan/model.php

@@ -187,6 +187,7 @@ class programplanModel extends model
             $data->id            = $plan->id;
             $data->type          = 'plan';
             $data->text          = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
+            $data->name          = $plan->name;
             $data->percent       = $plan->percent;
             $data->attribute     = zget($this->lang->stage->typeList, $plan->attribute);
             $data->milestone     = zget($this->lang->programplan->milestoneList, $plan->milestone);

module/story/view/linkstories.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $story->id;?></span>
-      <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title, '_blank', "title='$story->title'");?>
+      <?php echo $story->title;?>
       <?php $title = $story->type == 'story' ? $lang->story->linkStoriesAB : $lang->story->linkRequirementsAB?>
       <small class='text-muted'> <?php echo $lang->arrow . $title;?></small>
     </h2>

module/testcase/view/zerocase.html.php

@@ -139,7 +139,8 @@
 
         if(common::hasPriv('story', 'batchChangeStage'))
         {
-            echo "<div class='btn-group dropup'>";
+            $class = count($stories) <= 3 ? 'dropdown' : 'dropup';
+            echo "<div class='btn-group $class'>";
             echo html::commonButton($lang->story->stageAB . "<span class='caret'></span>", "data-toggle='dropdown'");
             echo "<ul class='dropdown-menu'>";
             $lang->story->stageList[''] = $lang->null;