Merge branch 'sprint/master_zhouxudong_23111' into 'master'

Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722

module/bug/js/common.js

@@ -713,7 +713,7 @@ function notice()
             if(typeof(branch) == 'undefined') branch = 0;
             var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch);
             if(config.onlybody != 'yes') link += link.indexOf('?') >= 0 ? '&onlybody=yes' : '?onlybody=yes';
-            html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
+            html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createRelease + '</a> ';
             html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
         }
         else

module/kanban/model.php

@@ -2064,7 +2064,7 @@ class kanbanModel extends model
         $this->dao->insert(TABLE_KANBAN)->data($kanban)
             ->autoCheck()
             ->batchCheck($this->config->kanban->create->requiredFields, 'notempty')
-            ->check('name', 'unique')
+            ->check('name', 'unique', "space = {$kanban->space}")
             ->exec();
 
         if(!dao::isError())