Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/gitlab/lang/zh-cn.php

@@ -5,6 +5,7 @@ $lang->gitlab->browse        = '浏览gitlab';
 $lang->gitlab->create        = '添加gitlab';
 $lang->gitlab->edit          = '编辑gitlab';
 $lang->gitlab->bindUser      = '绑定用户';
+$lang->gitlab->webhook       = 'webhook';
 $lang->gitlab->bindProduct   = '关联产品';
 $lang->gitlab->importIssue   = '关联issue';
 $lang->gitlab->delete        = '删除';

module/group/lang/resource.php

@@ -62,6 +62,7 @@ $lang->moduleOrder[200] = 'backup';
 $lang->moduleOrder[205] = 'cron';
 $lang->moduleOrder[210] = 'dev';
 $lang->moduleOrder[215] = 'message';
+$lang->moduleOrder[220] = 'gitlab';
 
 $lang->resource = new stdclass();
 
@@ -1116,6 +1117,26 @@ $lang->svn->methodOrder[5]  = 'diff';
 $lang->svn->methodOrder[10] = 'cat';
 $lang->svn->methodOrder[15] = 'apiSync';
 
+/* GitLab. */
+$lang->resource->gitlab = new stdclass();
+$lang->resource->gitlab->browse      = 'browse';
+$lang->resource->gitlab->create      = 'create';
+$lang->resource->gitlab->edit        = 'edit';
+$lang->resource->gitlab->importIssue = 'importIssue';
+$lang->resource->gitlab->webhook     = 'webhook';
+$lang->resource->gitlab->delete      = 'delete';
+$lang->resource->gitlab->bindUser    = 'bindUser';
+$lang->resource->gitlab->bindProduct = 'bindProduct';
+
+$lang->gitlab->methodOrder[5]  = 'browse';
+$lang->gitlab->methodOrder[10] = 'create';
+$lang->gitlab->methodOrder[15] = 'edit';
+$lang->gitlab->methodOrder[20] = 'importIssue';
+$lang->gitlab->methodOrder[25] = 'webhook';
+$lang->gitlab->methodOrder[30] = 'delete';
+$lang->gitlab->methodOrder[35] = 'bindUser';
+$lang->gitlab->methodOrder[40] = 'bindProduct'; 
+
 /* Git. */
 $lang->resource->git = new stdclass();
 $lang->resource->git->diff    = 'diff';

module/upgrade/js/mergeprogram.js

@@ -221,9 +221,9 @@ $(function()
         /* If the project is checked, the relevant form will be displayed according to the selected mode. */
         $('[id^=sprints]').each(function()
         {
+            hiddenProject();
             if($(this).prop('checked'))
             {
-                hiddenProject();
                 var projectType = $('input[name="projectType"]:checked').val();
                 if(projectType == 'project')
                 {