Merge branch 'sprint/231_tianshujie_bug' into 'master'

Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5111

module/product/view/browse.html.php

@@ -388,8 +388,8 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             $disabled   = $canBatchEdit ? '' : "disabled='disabled'";
             $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=$projectID&branch=$branch&storyType=$storyType");
             ?>
-            <?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage) echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
-            <?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage):?>
+            <?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch) echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");?>
+            <?php if($canBatchEdit or $canBatchClose or $canBatchUnlink or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch):?>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
             <?php endif;?>
             <ul class='dropdown-menu'>

module/task/view/create.html.php

@@ -21,9 +21,6 @@
 <?php js::set('estimateNotEmpty', sprintf($lang->error->notempty, $lang->task->estimate))?>
 <?php js::set('lifetime', $execution->lifetime);?>
 <?php js::set('lifetimeList', $lifetimeList);?>
-<?php if(!empty($storyID) and !empty($stories[$storyID])):?>
-<style> .title-group.required > .required:after {right: 110px;}</style>
-<?php endif;?>
 <?php
 $requiredFields = array();
 foreach(explode(',', $config->task->create->requiredFields) as $field)