* Code for task #44361.

module/execution/control.php

@@ -3317,5 +3317,4 @@ class execution extends control
         $groups = $this->lang->kanban->group->$type;
         die(html::select("group", $groups, $group, 'class="form-control chosen" data-max_drop_width="215"'));
     }
-
 }

module/stakeholder/model.php

@@ -328,7 +328,7 @@ class stakeholderModel extends model
             }
         }
 
-        if(empty($parents)) return false;
+        if(empty($parents)) return array();
 
         /* Get all parent stakeholders.*/
         $parentStakeholders = $this->dao->select('objectID, user')->from(TABLE_STAKEHOLDER)->where('objectID')->in(array_keys($parents))->andWhere('deleted')->eq('0')->fetchAll();

module/upgrade/css/mergeprogram.css

@@ -34,3 +34,8 @@ div.divider {vertical-align: middle;}
 .sprintGroup {margin-left: 6px;}
 .programParams td > label:first-child {margin-right: 10px;}
 .programParams td > label:last-child {margin-left: 0px;}
+
+.projectList .scroll-handle .checkbox-primary {display: inline-block;}
+.sprintRename {margin-top: 5px;}
+.sprintRename input {display: inline-block; width: auto;}
+.sprintRename .btn-group {display: inline-block;}

module/upgrade/js/mergeprogram.js

@@ -1150,3 +1150,26 @@ function isSelectAll(lineID = 0, type = 'product')
     if(objectNum > checkedObjectNum || objectNum == 0) checked = false;
     return checked;
 }
+
+$(function()
+{
+    $('.sprintItem').mouseover(function()
+    {
+        $(this).find('#sprintEdit').removeClass('hidden');
+    }).mouseout(function()
+    {
+        $(this).find('#sprintEdit').addClass('hidden');
+    })
+
+    $(document).on('click', '#sprintEdit i', function()
+    {
+        $(this).parents('.sprintItem').addClass('hidden');
+        $(this).parents('.sprintItem').next('.sprintRename').removeClass('hidden');
+    })
+
+    $('.sprintRename button.name-cancel').click(function()
+    {
+        $(this).closest('.sprintRename').addClass('hidden');
+        $(this).closest('.sprintRename').prev('.sprintItem').removeClass('hidden');
+    })
+})

module/upgrade/view/mergebyproduct.html.php

@@ -29,8 +29,18 @@
             <div class='scroll-handle'>
             <?php if(isset($productGroups[$productID])):?>
             <?php foreach($productGroups[$productID] as $sprint):?>
-            <?php echo html::checkBox("sprints[$productID]", array($sprint->id => $sprint->name), '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-status='{$sprint->status}' data-pm='{$sprint->PM}'");?>
-            <?php echo html::hidden("sprintIdList[$productID][$sprint->id]", $sprint->id);?>
+              <div class="sprintItem">
+                <?php echo html::checkBox("sprints[$productID]", array($sprint->id => $sprint->name), '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-status='{$sprint->status}' data-pm='{$sprint->PM}'");?>
+                <?php echo html::hidden("sprintIdList[$productID][$sprint->id]", $sprint->id);?>
+                <a href='#' id='sprintEdit' class='hidden'><i class="icon-common-edit icon-edit muted"></i></a>
+              </div>
+              <div class="sprintRename hidden">
+                <?php echo html::input("sprintRename[$sprint->id]", $sprint->name, "class='form-control'");?>
+                <div class="btn-group">
+                  <button type="button" class="btn btn-success name-confirm"><i class='icon icon-check'></i></button>
+                  <button type="button" class="btn btn-gray name-cancel"><i class='icon icon-close'></i></button>
+                </div>
+              </div>
             <?php endforeach;?>
             <?php endif;?>
             </div>