From 6a00a0981793a985b38196ad3c205ef0e5cea4c9 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 14 Dec 2020 11:19:43 +0800 Subject: [PATCH 01/37] * Fix bug#3740. --- config/zentaopms.php | 1 + module/action/config.php | 1 + module/action/lang/de.php | 1 + module/action/lang/en.php | 1 + module/action/lang/fr.php | 1 + module/action/lang/vi.php | 1 + module/action/lang/zh-cn.php | 1 + module/action/lang/zh-tw.php | 1 + 8 files changed, 8 insertions(+) diff --git a/config/zentaopms.php b/config/zentaopms.php index f9c24ca5ce..db03fdb2be 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -210,3 +210,4 @@ $config->objectTables['module'] = TABLE_MODULE; $config->objectTables['caselib'] = TABLE_TESTSUITE; $config->objectTables['entry'] = TABLE_ENTRY; $config->objectTables['webhook'] = TABLE_WEBHOOK; +$config->objectTables['job'] = TABLE_JOB; diff --git a/module/action/config.php b/module/action/config.php index 0946a6c5c6..c745188014 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -21,6 +21,7 @@ $config->action->objectNameFields['caselib'] = 'name'; $config->action->objectNameFields['testreport'] = 'title'; $config->action->objectNameFields['entry'] = 'name'; $config->action->objectNameFields['webhook'] = 'name'; +$config->action->objectNameFields['job'] = 'name'; $config->action->commonImgSize = 870; diff --git a/module/action/lang/de.php b/module/action/lang/de.php index e859adf789..0038a9e160 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = 'Bibliothek'; $lang->action->objectTypes['testreport'] = 'Berichte'; $lang->action->objectTypes['entry'] = 'Eintrag'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = 'Job'; /* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 8346ec5247..71089491e9 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = 'Library'; $lang->action->objectTypes['testreport'] = 'Report'; $lang->action->objectTypes['entry'] = 'Entry'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = 'Job'; /* Used to describe operation history. */ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 4fab57dd08..14a31a8ae6 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = 'Library'; $lang->action->objectTypes['testreport'] = 'Edition'; $lang->action->objectTypes['entry'] = 'Entrée'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = 'Job'; /* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php index 6cb4005ca6..e5395ea663 100644 --- a/module/action/lang/vi.php +++ b/module/action/lang/vi.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = 'Thư viện'; $lang->action->objectTypes['testreport'] = 'Báo cáo'; $lang->action->objectTypes['entry'] = 'Entry'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = 'Job'; /* Used to describe operation history. */ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index f6f02f7d4c..f80f195fb4 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = '用例库'; $lang->action->objectTypes['testreport'] = '报告'; $lang->action->objectTypes['entry'] = '应用'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = '构建'; /* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 1e9e30e08e..04d4edde03 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -87,6 +87,7 @@ $lang->action->objectTypes['caselib'] = '用例庫'; $lang->action->objectTypes['testreport'] = '報告'; $lang->action->objectTypes['entry'] = '應用'; $lang->action->objectTypes['webhook'] = 'Webhook'; +$lang->action->objectTypes['job'] = '構建'; /* 用來描述操作歷史記錄。*/ $lang->action->desc = new stdclass(); From 84a13edd5ea868d5b5198bfafa8324753477d510 Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 14 Dec 2020 14:14:20 +0800 Subject: [PATCH 02/37] * update $.gotoObject method. --- www/js/zui/min.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/js/zui/min.js b/www/js/zui/min.js index afe16dd02f..9aff8120d6 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: ZUI for Zentao - v1.9.2 - 2020-12-11 + * ZUI: ZUI for Zentao - v1.9.2 - 2020-12-14 * http://openzui.com * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2020 cnezsoft.com; Licensed MIT @@ -75,5 +75,5 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"= * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var o="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],a=String.fromCharCode(e.which).toLowerCase(),s="",r={};e.altKey&&"alt"!==o&&(s+="alt+"),e.ctrlKey&&"ctrl"!==o&&(s+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==o&&(s+="meta+"),e.shiftKey&&"shift"!==o&&(s+="shift+"),o?r[s+o]=!0:(r[s+a]=!0,r[s+t.hotkeys.shiftNums[a]]=!0,"shift+"===s&&(r[t.hotkeys.shiftNums[a]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return Array.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},s[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",o=0,a=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},s={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};a.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},a.prototype.add=function(e,i,n,o,a){var s,r=t(e),l=this.options;if(r.is("li")?(s=r.children("ul"),s.length||(s=t("