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

* Finish task#8375.

Browse Source
This commit is contained in:
qiyu-xie
2020-11-20 08:15:56 +08:00
parent 91c934529e
commit 09e7734adf
8 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update12.4.4.sql
+1 -1
View File
@@ -1,4 +1,4 @@
ALTER TABLE `zt_job` ADD `customParam` text AFTER `lastTag`;
ALTER TABLE `zt_job` ADD `customParam` text AFTER `atTime`;
ALTER TABLE `zt_doc` ADD `mailto` text AFTER `editedDate`;
ALTER TABLE `zt_task` CHANGE `realStarted` `realStarted` datetime NOT NULL AFTER `estStarted`;
ALTER TABLE `zt_group` CHANGE `program` `PRJ` mediumint(8) unsigned NOT NULL DEFAULT 0;
module/job/lang/de.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = 'Wert';
$lang->job->lblBasic = 'Basic Info';
$lang->job->example = 'e.g.';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'e.g. 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Send execute request success.';
$lang->job->inputName = 'Bitte geben Sie den Parameternamen ein.';
$lang->job->example = 'e.g.';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'e.g. 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Send execute request success.';
$lang->job->inputName = 'Bitte geben Sie den Parameternamen ein.';
$lang->job->invalidName = 'Die Parameternamen sollten Buchstaben, Zahlen oder Unterstriche sein.';
$lang->job->buildTypeList['build'] = 'Only Build';
$lang->job->buildTypeList['buildAndDeploy'] = 'Build And Deploy';
module/job/lang/en.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = 'Value';
$lang->job->lblBasic = 'Basic Info';
$lang->job->example = 'e.g.';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'e.g. 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Send execute request success.';
$lang->job->inputName = 'Please enter parameter name.';
$lang->job->example = 'e.g.';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'e.g. 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Send execute request success.';
$lang->job->inputName = 'Please enter parameter name.';
$lang->job->invalidName = 'The parameter name should be letters, numbers or underlines.';
$lang->job->buildTypeList['build'] = 'Only Build';
$lang->job->buildTypeList['buildAndDeploy'] = 'Build And Deploy';
module/job/lang/fr.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = 'PH';
$lang->job->lblBasic = 'Infos de Base';
$lang->job->example = 'ex.';
$lang->job->commitEx = "Utilis pour faire correspondre les mots cl閟 utilis閟 pour cr閑r une compilation. Plusieurs mots cl閟 sont s閜ar閟 par ','";
$lang->job->cronSample = 'ex: 0 0 2 * * 2-6/1 signifie 2:00 a.m. chaque jour de la semaine.';
$lang->job->sendExec = "Envoi de la demande d'ex閏ution r閡ssie.";
$lang->job->inputName = 'Veuillez saisir le nom du paramètre.';
$lang->job->example = 'ex.';
$lang->job->commitEx = "Utilis pour faire correspondre les mots cl閟 utilis閟 pour cr閑r une compilation. Plusieurs mots cl閟 sont s閜ar閟 par ','";
$lang->job->cronSample = 'ex: 0 0 2 * * 2-6/1 signifie 2:00 a.m. chaque jour de la semaine.';
$lang->job->sendExec = "Envoi de la demande d'ex閏ution r閡ssie.";
$lang->job->inputName = 'Veuillez saisir le nom du paramètre.';
$lang->job->invalidName = 'Les noms des paramètres doivent être alphabétiques, numériques ou soulignés.';
$lang->job->buildTypeList['build'] = 'Seulement Build';
$lang->job->buildTypeList['buildAndDeploy'] = 'Build et D閜loiement';
module/job/lang/vi.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = 'giá';
$lang->job->lblBasic = 'Basic Info';
$lang->job->example = 'ví dụ: ';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'ví dụ: 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Gửi execute request success.';
$lang->job->inputName = 'Hãy nhập tên tham số.';
$lang->job->example = 'ví dụ: ';
$lang->job->commitEx = "Used to match the keywords used to create a compile. Multiple keywords are separated by ','";
$lang->job->cronSample = 'ví dụ: 0 0 2 * * 2-6/1 means 2:00 a.m. every weekday.';
$lang->job->sendExec = 'Gửi execute request success.';
$lang->job->inputName = 'Hãy nhập tên tham số.';
$lang->job->invalidName = 'Tên tham số phải là các chữ cái, số điện, hay ô gạch.';
$lang->job->buildTypeList['build'] = 'Chỉ bản dựng';
$lang->job->buildTypeList['buildAndDeploy'] = 'Bản dựng và triển khai';
module/job/lang/zh-cn.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = '值';
$lang->job->lblBasic = '基本信息';
$lang->job->example = '举例';
$lang->job->commitEx = "用于匹配创建构建任务的关键字，多个关键字用','分割";
$lang->job->cronSample = '如 0 0 2 * * 2-6/1 表示每个工作日凌晨2点';
$lang->job->sendExec = '发送执行请求成功！执行结果：%s';
$lang->job->inputName = '请输入参数名称。';
$lang->job->example = '举例';
$lang->job->commitEx = "用于匹配创建构建任务的关键字，多个关键字用','分割";
$lang->job->cronSample = '如 0 0 2 * * 2-6/1 表示每个工作日凌晨2点';
$lang->job->sendExec = '发送执行请求成功！执行结果：%s';
$lang->job->inputName = '请输入参数名称。';
$lang->job->invalidName = '参数名称应该是英文字母、数字或下划线的组合。';
$lang->job->buildTypeList['build'] = '仅构建';
$lang->job->buildTypeList['buildAndDeploy'] = '构建部署';
module/job/lang/zh-tw.php
+6 -5
View File
@@ -32,11 +32,12 @@ $lang->job->paramValue = '值';
$lang->job->lblBasic = '基本信息';
$lang->job->example = '舉例';
$lang->job->commitEx = "用於匹配創建構建任務的關鍵字，多個關鍵字用','分割";
$lang->job->cronSample = '如 0 0 2 * * 2-6/1 表示每個工作日凌晨2點';
$lang->job->sendExec = '發送執行請求成功！執行結果：%s';
$lang->job->inputName = '請輸入參數名稱。';
$lang->job->example = '舉例';
$lang->job->commitEx = "用於匹配創建構建任務的關鍵字，多個關鍵字用','分割";
$lang->job->cronSample = '如 0 0 2 * * 2-6/1 表示每個工作日凌晨2點';
$lang->job->sendExec = '發送執行請求成功！執行結果：%s';
$lang->job->inputName = '請輸入參數名稱。';
$lang->job->invalidName = '參數名稱應該是英文字母、數字或下劃綫的組合。';
$lang->job->buildTypeList['build'] = '僅構建';
$lang->job->buildTypeList['buildAndDeploy'] = '構建部署';
module/job/model.php
+12
View File
@@ -139,6 +139,12 @@ class jobModel extends model
return false;
}
if(!empty($paramName) and !validater::checkREG($paramName, '/^[A-Za-z_0-9]+$/'))
{
dao::$errors[] = $this->lang->job->invalidName;
return false;
}
if(!empty($paramName)) $customParam[$paramName] = $paramValue;
}
unset($job->paramName);
@@ -199,6 +205,12 @@ class jobModel extends model
return false;
}
if(!empty($paramName) and !validater::checkREG($paramName, '/^[A-Za-z_0-9]+$/'))
{
dao::$errors[] = $this->lang->job->invalidName;
return false;
}
if(!empty($paramName)) $customParam[$paramName] = $paramValue;
}
unset($job->paramName);