diff --git a/module/mr/js/create.js b/module/mr/js/create.js index a1492677f9..d324201335 100644 --- a/module/mr/js/create.js +++ b/module/mr/js/create.js @@ -2,10 +2,10 @@ $(function() { $('#gitlabID').change(function() { - host = $('#gitlabID').val(); + host = $('#gitlabID').val(); if(host == '') return false; - url = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host); + url = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host); $.get(url, function(response) { $('#sourceProject').html('').append(response); @@ -13,18 +13,27 @@ $(function() }); }); - $('#sourceProject').change(function() + $('#sourceProject,#targetProject').change(function() { - $option = $(this).find('option:selected'); - $('#name').val($option.data('name')); - project = $('#sourceProject').val(); - url = createLink('gitlab', 'ajaxgetprojectbranches', "gitlabID=" + host + "&projectID=" + project); - $.get(url, function(response) + sourceProject = $(this).val(); + var branchSelect = $(this).parents('td').find('select[name*=Branch]'); + branchUrl = createLink('gitlab', 'ajaxgetprojectbranches', "gitlabID=" + host + "&projectID=" + sourceProject); + $.get(branchUrl, function(response) { - $('#sourceBranch').html('').append(response); - $('#sourceBranch').chosen().trigger("chosen:updated");; + branchSelect.html('').append(response); + branchSelect.chosen().trigger("chosen:updated");; }); - $('#targetProject').chosen().trigger("chosen:updated");; + }); + + $('#sourceProject').change(function() + { + sourceProject = $(this).val(); + projectUrl = createLink('mr', 'ajaxGetMRTragetProjects', "gitlabID=" + host + "&projectID=" + sourceProject); + $.get(projectUrl, function(response) + { + $('#targetProject').html('').append(response); + $('#targetProject').chosen().trigger("chosen:updated");; + }); }); }); diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 326919596f..130955462d 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -17,6 +17,7 @@ $lang->mr->reviewer = '评审人'; $lang->mr->link = 'GitLab链接'; $lang->mr->canMerge = '是否可合并'; +$lang->mr->description = '描述'; $lang->mr->confirmDelete = '确认删除该merge request吗?'; $lang->mr->sourceProject = '源项目'; $lang->mr->sourceBranch = '源分支'; diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php index d05a6824db..6acccf70ee 100644 --- a/module/mr/view/create.html.php +++ b/module/mr/view/create.html.php @@ -15,8 +15,8 @@