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

module/action/lang/en.php

@@ -286,6 +286,8 @@ $lang->action->label->updatetrainee         = 'Update Trainee';
 $lang->action->label->createmr              = 'MR Linked';
 $lang->action->label->mergedmr              = 'MR Merged';
 $lang->action->label->reopen                = 'Reopen';
+$lang->action->label->approve               = 'Passed';
+$lang->action->label->reject                = 'Rejected';
 
 /* Dynamic information is grouped by object. */
 $lang->action->dynamicAction                    = new stdclass;

module/action/lang/zh-cn.php

@@ -288,6 +288,8 @@ $lang->action->label->mergedmr              = 'MR合并了';
 $lang->action->label->compilepass           = '构建成功';
 $lang->action->label->compilefail           = '构建失败';
 $lang->action->label->reopen                = '重新打开';
+$lang->action->label->approve               = '通过了';
+$lang->action->label->reject                = '拒绝了';
 
 /* 动态信息按照对象分组 */
 $lang->action->dynamicAction                    = new stdclass();

module/gitlab/control.php

@@ -836,7 +836,7 @@ class gitlab extends control
 
             if($res or is_array($res))
             {
-                die(js::locate($this->createLink('repo', 'maintain'), 'parent'));
+                die(js::alert($this->lang->gitlab->addWebhookSuccess));
             }
             else
             {

module/gitlab/lang/en.php

@@ -19,6 +19,7 @@ $lang->gitlab->binded            = 'Binded';
 $lang->gitlab->serverFail        = 'Connect to GitLab server failed, please check the GitLab server.';
 $lang->gitlab->lastUpdate        = 'Last Update';
 $lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';
+$lang->gitlab->addWebhookSuccess = 'Webhook created successfully';
 $lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log';
 $lang->gitlab->placeholderSearch = 'Project name';
 
@@ -42,6 +43,7 @@ $lang->gitlab->createUser           = 'Create user';
 $lang->gitlab->editUser             = 'Edit user';
 $lang->gitlab->deleteUser           = 'Delete user';
 $lang->gitlab->manageGroupMembers   = 'Manage group member';
+$lang->gitlab->createWebhook        = 'Create Webhook';
 
 $lang->gitlab->id             = 'ID';
 $lang->gitlab->name           = "GitLab Name";

module/gitlab/lang/zh-cn.php

@@ -19,6 +19,7 @@ $lang->gitlab->binded            = '已绑定';
 $lang->gitlab->serverFail        = '连接GitLab服务器异常，请检查GitLab服务器。';
 $lang->gitlab->lastUpdate        = '最后更新';
 $lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗？';
+$lang->gitlab->addWebhookSuccess = 'webhook创建成功';
 $lang->gitlab->failCreateWebhook = 'Webhook创建失败，请查看日志';
 $lang->gitlab->placeholderSearch = '请输入项目名称';
 
@@ -42,6 +43,7 @@ $lang->gitlab->createUser           = '添加用户';
 $lang->gitlab->editUser             = '编辑用户';
 $lang->gitlab->deleteUser           = '删除用户';
 $lang->gitlab->manageGroupMembers   = '群组成员管理';
+$lang->gitlab->createWebhook        = '创建Webhook';
 
 $lang->gitlab->id             = 'ID';
 $lang->gitlab->name           = "{$lang->gitlab->common}名称";

module/group/lang/resource.php

@@ -1162,6 +1162,7 @@ $lang->resource->gitlab->createUser           = 'createUser';
 $lang->resource->gitlab->editUser             = 'editUser';
 $lang->resource->gitlab->deleteUser           = 'deleteUser';
 $lang->resource->gitlab->webhook              = 'webhook';
+$lang->resource->gitlab->createWebhook        = 'createWebhook';
 $lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
 
 $lang->gitlab->methodOrder[5]   = 'browse';
@@ -1185,7 +1186,8 @@ $lang->gitlab->methodOrder[95]  = 'createUser';
 $lang->gitlab->methodOrder[100] = 'editUser';
 $lang->gitlab->methodOrder[105] = 'deleteUser';
 $lang->gitlab->methodOrder[110] = 'webhook';
-$lang->gitlab->methodOrder[115] = 'manageProjectMembers';
+$lang->gitlab->methodOrder[115] = 'createWebhook';
+$lang->gitlab->methodOrder[120] = 'manageProjectMembers';
 
 /* merge request. */
 $lang->resource->mr = new stdclass();