diff --git a/module/gitlab/js/managegroupmembers.js b/module/gitlab/js/managegroupmembers.js index e8fdb17736..c67e34038e 100644 --- a/module/gitlab/js/managegroupmembers.js +++ b/module/gitlab/js/managegroupmembers.js @@ -41,7 +41,7 @@ function addItem(obj) */ function deleteItem(obj) { - if($('#teamForm .table tbody').children().length < 2) return false; + if($('#teamForm .table-form tbody').children().length < 2) return false; $(obj).closest('tr').remove(); } diff --git a/module/gitlab/js/manageprojectmembers.js b/module/gitlab/js/manageprojectmembers.js index 589e0ffc61..f67e13d81e 100644 --- a/module/gitlab/js/manageprojectmembers.js +++ b/module/gitlab/js/manageprojectmembers.js @@ -41,6 +41,6 @@ function addItem(obj) */ function deleteItem(obj) { - if($('#teamForm .table tbody').children().length < 2) return false; + if($('#teamForm .table-form tbody').children().length < 2) return false; $(obj).closest('tr').remove(); -} \ No newline at end of file +} diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 09692190d3..7a29b5c406 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -107,7 +107,7 @@ $lang->mr->closeSuccess = "已关闭合并请求。"; $lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target"; -$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样'; +$lang->mr->errorLang[0] = '源项目分支与目标项目分支不能相同'; $lang->mr->from = "从"; $lang->mr->to = "合并到"; diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 54667871b7..55f984cbaa 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -61,12 +61,6 @@