From 74d5fbf6a6a71490cf4ce5fc975d592ed0b4d83d Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Thu, 24 Mar 2022 11:29:10 +0800 Subject: [PATCH 1/4] * add params --- extension/lite/product/ext/model/getpairs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/lite/product/ext/model/getpairs.php b/extension/lite/product/ext/model/getpairs.php index d09219a3e2..4240902fad 100644 --- a/extension/lite/product/ext/model/getpairs.php +++ b/extension/lite/product/ext/model/getpairs.php @@ -6,7 +6,7 @@ * @param string $programID * @return array */ -public function getPairs($mode = '', $programID = 0) +public function getPairs($mode = '', $programID = 0, $append = '') { if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs(); From 4e7f99e30c3c57c01de91c1d839efae75d675d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Thu, 24 Mar 2022 14:52:06 +0800 Subject: [PATCH 2/4] * code for task #51509. --- extension/lite/common/ext/lang/en/lite.php | 5 +++++ extension/lite/common/ext/lang/zh-cn/lite.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index c52725fcb6..44395058dd 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -139,9 +139,11 @@ $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +$xuanxuanMenu = $lang->admin->menu->xuanxuan; /* Admin menu. */ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); +$lang->admin->menu->xuanxuan = $xuanxuanMenu; $lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,'); $lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate'); $lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension'); @@ -149,9 +151,12 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias' $lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms'); $lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany'); +$lang->admin->menu->xuanxuan['link'] = 'Chat|admin|xuanxuan'; + /* Admin menu order. */ $lang->admin->menuOrder = array(); $lang->admin->menuOrder[5] = 'index'; +$lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menuOrder[10] = 'company'; $lang->admin->menuOrder[15] = 'custom'; $lang->admin->menuOrder[20] = 'message'; diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index 9c77550db4..c01a054394 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -139,9 +139,11 @@ $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +$xuanxuanMenu = $lang->admin->menu->xuanxuan; /* Admin menu. */ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); +$lang->admin->menu->xuanxuan = $xuanxuanMenu; $lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,'); $lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate'); $lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension'); @@ -149,9 +151,12 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias' $lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms'); $lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany'); +$lang->admin->menu->xuanxuan['link'] = '聊天|admin|xuanxuan'; + /* Admin menu order. */ $lang->admin->menuOrder = array(); $lang->admin->menuOrder[5] = 'index'; +$lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menuOrder[10] = 'company'; $lang->admin->menuOrder[15] = 'custom'; $lang->admin->menuOrder[20] = 'message'; From 19e6390ed7681813517937407bab60f3c31196eb Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 30 Mar 2022 15:16:52 +0800 Subject: [PATCH 3/4] * Fix bug #20890. --- module/execution/model.php | 4 +++- module/execution/view/task.html.php | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index cd6c878de0..5f58cc41b7 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -526,7 +526,9 @@ class executionModel extends model ->where('id')->eq($executionID) ->limit(1) ->exec(); - + + if(dao::isError()) return false; + /* Get team and language item. */ $this->loadModel('user'); $team = $this->user->getTeamMemberPairs($executionID, 'execution'); diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php index 1681e153bc..39157b9dd8 100644 --- a/module/execution/view/task.html.php +++ b/module/execution/view/task.html.php @@ -144,6 +144,7 @@ body {margin-bottom: 25px;} execution = $executionID; + $taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")); ?> @@ -154,10 +155,6 @@ body {margin-bottom: 25px;} $wizardParams = helper::safe64Encode("executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")); $taskCreateLink = $this->createLink('tutorial', 'wizard', "module=task&method=create¶ms=$wizardParams"); } - else - { - $taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")); - } echo html::a($taskCreateLink, " {$lang->task->create}", '', "class='btn btn-primary'"); ?> From 195b13325e2e056e78c6a8b4d2adc0870ce48e11 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Wed, 30 Mar 2022 15:29:40 +0800 Subject: [PATCH 4/4] * fix bug #20811 --- module/tree/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 99a9876b90..84443c4a8c 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -26,7 +26,7 @@ $name = $lang->tree->name; if($viewType == 'line') $name = $lang->tree->line; if($viewType == 'api') $name = $lang->tree->dir; if($viewType == 'doc') $name = $lang->doc->catalogName; -if($viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') $name = $lang->tree->dir; +if($viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') $name = $lang->tree->cate; $childTitle = $lang->tree->child; if(strpos($viewType, 'feedback') !== false) $childTitle = $lang->tree->subCategory;