Merge branch 'sprint/187_tianshujie_fixbug' into 'master'

Sprint/187 tianshujie fixbug

See merge request easycorp/zentaopms!2154

module/bug/control.php

@@ -2236,15 +2236,17 @@ class bug extends control
      * Ajax get project team members.
      *
      * @param  int    $projectID
+     * @param  string $$selectedUser
      * @access public
-     * @return void
+     * @return string
      */
-    public function ajaxGetProjectTeamMembers($projectID)
+    public function ajaxGetProjectTeamMembers($projectID, $selectedUser = '')
     {
         $users       = $this->loadModel('user')->getPairs('noclosed');
         $teamMembers = empty($projectID) ? array() : $this->loadModel('project')->getTeamMemberPairs($projectID);
         foreach($teamMembers as $account => $member) $teamMembers[$account] = $users[$account];
-        return print(html::select('assignedTo', $teamMembers, '', 'class="form-control"'));
+
+        return print(html::select('assignedTo', $teamMembers, $selectedUser, 'class="form-control"'));
     }
 
 

module/bug/js/common.js

@@ -29,11 +29,7 @@ $(function()
  */
 function loadAll(productID)
 {
-    if(page == 'create')
-    {
-        loadExecutionTeamMembers(productID);
-        setAssignedTo();
-    }
+    if(page == 'create') loadExecutionTeamMembers(productID, true);
 
     if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed)
     {
@@ -485,7 +481,7 @@ function loadExecutionBuilds(executionID)
  */
 function loadProjectTeamMembers(projectID)
 {
-    link = createLink('bug', 'ajaxGetProjectTeamMembers', 'projectID=' + projectID);
+    link = createLink('bug', 'ajaxGetProjectTeamMembers', 'projectID=' + projectID + '&selectedUser=' + $('#assignedTo').val());
     $.get(link, function(data)
     {
         if(!data) data = '<select id="assignedTo" name="assignedTo" class="form-control"></select>';

module/bug/js/create.js

@@ -25,10 +25,11 @@ function loadAllUsers()
   * Load team members of the latest execution of a product as assignedTo list.
   *
   * @param  int    $productID
+  * @param  bool   $changeProduct
   * @access public
   * @return void
   */
-function loadExecutionTeamMembers(productID)
+function loadExecutionTeamMembers(productID, changeProduct)
 {
     var link = createLink('bug', 'ajaxLoadExecutionTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
     $.post(link, function(data)
@@ -36,6 +37,7 @@ function loadExecutionTeamMembers(productID)
         $('#assignedTo').replaceWith(data);
         $('#assignedTo_chosen').remove();
         $('#assignedTo').chosen();
+        if(typeof(changeProduct) != undefined && changeProduct) setAssignedTo();
     })
 }
 

module/bug/view/create.html.php

@@ -124,7 +124,9 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               <div class='input-group' id='buildBox'>
                 <span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
                 <?php echo html::select('openedBuild[]', $builds, empty($buildID) ? '' : $buildID, "multiple=multiple class='chosen form-control'");?>
+                <?php if(count($builds) < 2):?>
                 <span class='input-group-addon fix-border' id='buildBoxActions'></span>
+                <?php endif;?>
                 <div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' id='all' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
               </div>
             </td>

module/my/control.php

@@ -499,7 +499,7 @@ EOF;
         $this->view->position[]  = $this->lang->my->bug;
         $this->view->bugs        = $bugs;
         $this->view->users       = $this->user->getPairs('noletter');
-        $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted');
+        $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
         $this->view->tabID       = 'bug';
         $this->view->type        = $type;
         $this->view->recTotal    = $recTotal;

module/my/view/buildcontactlists.html.php

@@ -17,8 +17,9 @@ if($contactLists)
 }
 else
 {
+    $width = isonlybody() ? 'data-width=100%' : '';
     echo '<span class="input-group-btn">';
-    echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe'><i class='icon icon-cog'></i></a>";
+    echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe' $width><i class='icon icon-cog'></i></a>";
     echo '</span>';
     echo '<span class="input-group-btn">';
     echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon"' . "onclick=\"ajaxGetContacts(this, '$dropdownName')\"" . '><i class="icon icon-refresh"></i></button>';

module/story/view/batchedit.html.php

@@ -148,7 +148,7 @@ foreach(explode(',', $showFields) as $field)
         <tr>
           <td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center form-actions'>
             <?php echo html::submitButton();?>
-            <?php echo $this->app->tab == 'product' ? html::a($this->session->storyList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
+            <?php echo ($this->app->tab == 'product' or $this->app->tab == 'execution') ? html::a($this->session->storyList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
           </td>
         </tr>
       </tfoot>