Merge branch 'fixbugs_zhouxin_11804' into 'master'

* Fix bug #11804.

See merge request easycorp/zentaopms!2710

module/projectrelease/control.php

@@ -125,6 +125,7 @@ class projectrelease extends control
         unset($builds['trunk']);
 
         $this->view->title       = $this->view->project->name . $this->lang->colon . $this->lang->release->create;
+        $this->view->projectID   = $projectID;
         $this->view->builds      = $builds;
         $this->view->lastRelease = $this->projectrelease->getLast($projectID);
         $this->view->users       = $this->loadModel('user')->getPairs('noletter|noclosed');

module/projectrelease/js/common.js

@@ -27,7 +27,7 @@ function loadBranches(productID)
 {
     $('#branch').remove();
     $('#branch_chosen').remove();
-    $.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID + '&oldBranch=0&params=active'), function(data)
+    $.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID + '&oldBranch=0&params=active&projectID=' + projectID), function(data)
     {
         var $product = $('#product');
         var $inputGroup = $product.closest('.input-group');

module/projectrelease/view/create.html.php

@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('confirmLink', $confirmLink);?>
+<?php js::set('projectID', $projectID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>