Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#51534] add tips for gitlab webhook result.

Browse Source
This commit is contained in:
caoyanyi
2024-06-21 13:40:33 +08:00
committed by 田淑杰
parent 44d51003e2
commit 2a69e95fb5
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/lang/de.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->gitlab->serverFail = 'Connect to GitLab server failed, please chec
$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->failCreateWebhook = 'Failed to create Webhook, please view the log in tmp/log/saas.' . date('Ymd') . '.log.php';
$lang->gitlab->placeholderSearch = 'Enter name';
$lang->gitlab->bindStatus['binded'] = $lang->gitlab->binded;
module/gitlab/lang/en.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->gitlab->serverFail = 'Connect to GitLab server failed, please chec
$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->failCreateWebhook = 'Failed to create Webhook, please view the log in tmp/log/saas.' . date('Ymd') . '.log.php';
$lang->gitlab->placeholderSearch = 'Enter name';
$lang->gitlab->bindStatus['binded'] = $lang->gitlab->binded;
module/gitlab/lang/fr.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->gitlab->serverFail = 'Connect to GitLab server failed, please chec
$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->failCreateWebhook = 'Failed to create Webhook, please view the log in tmp/log/saas.' . date('Ymd') . '.log.php';
$lang->gitlab->placeholderSearch = 'Enter name';
$lang->gitlab->bindStatus['binded'] = $lang->gitlab->binded;
module/gitlab/lang/zh-cn.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->gitlab->serverFail = '连接GitLab服务器异常，请检查GitLa
$lang->gitlab->lastUpdate = '最后更新';
$lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗？';
$lang->gitlab->addWebhookSuccess = 'Webhook创建成功';
$lang->gitlab->failCreateWebhook = 'Webhook创建失败，请查看日志';
$lang->gitlab->failCreateWebhook = 'Webhook创建失败，请在tmp/log/saas.' . date('Ymd') . '.log.php 中查看日志';
$lang->gitlab->placeholderSearch = '请输入名称';
$lang->gitlab->bindStatus['binded'] = $lang->gitlab->binded;
module/gitlab/model.php
+2 -2
View File
@@ -1063,7 +1063,7 @@ class gitlabModel extends model
$apiRoot = $this->getApiRoot($gitlabID, false);
$url = sprintf($apiRoot, "/projects/{$projectID}/hooks");
return json_decode(commonModel::http($url, $newHook));
return json_decode(commonModel::http($url, $newHook, array(), array(), 'json'));
}
/**
@@ -1111,7 +1111,7 @@ class gitlabModel extends model
if(!empty($result->id)) return true;
if(!empty($result->message)) return array('result' => 'fail', 'message' => $result->message);
if(!empty($result->message)) return array('result' => 'fail', 'message' => $this->lang->gitlab->failCreateWebhook);
return false;
}