From 58ddcf54896166b7fca07daead9c3586ba7c6980 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 20 Nov 2018 09:53:44 +0800 Subject: [PATCH 1/3] * code for get extensions by api. --- module/extension/model.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/module/extension/model.php b/module/extension/model.php index a001cebfba..ea02b5bb8c 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -57,7 +57,22 @@ class extensionModel extends model */ public function fetchAPI($url) { - $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $this->config->version; + $this->app->loadConfig('upgrade'); + $version = $this->config->version; + if(strpos($version, 'biz') !== false) + { + $version = str_replace('.', '_', $version); + if(isset($this->config->bizVersion[$version])) $version = $this->config->bizVersion[$version]; + $version = str_replace('_', '.', $version); + } + if(strpos($version, 'pro') !== false) + { + $version = str_replace('.', '_', $version); + if(isset($this->config->proVersion[$version])) $version = $this->config->proVersion[$version]; + $version = str_replace('_', '.', $version); + } + + $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $version; $result = json_decode(common::http($url)); if(!isset($result->status)) return false; From 8cd37c37e19f51a9d86ffe43265e4918b4b96d07 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Tue, 20 Nov 2018 10:12:15 +0800 Subject: [PATCH 2/3] * Adjust code for task #5060. --- module/bug/view/browse.html.php | 28 +++------------------------ module/my/view/bug.html.php | 8 +------- module/my/view/story.html.php | 10 ++-------- module/product/view/browse.html.php | 29 ++++------------------------ module/project/view/bug.html.php | 8 +------- module/project/view/task.html.php | 19 ++---------------- module/testcase/view/browse.html.php | 18 ++--------------- module/testtask/view/cases.html.php | 10 +--------- 8 files changed, 16 insertions(+), 114 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index d61bfcb34a..0147853aff 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -296,14 +296,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow - $branchName) - { - $branchNames[] = $branchName; - } - $branchsPinYin = common::convert2Pinyin($branchNames); - ?> +
@@ -331,14 +324,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- $module) - { - $moduleNames[] = $module; - } - $modulesPinYin = common::convert2Pinyin($moduleNames); - ?> +
@@ -366,15 +352,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- $member) - { - if(empty($memberId)) continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); - ?> +
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index a210d909fc..13e5817b86 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -145,13 +145,7 @@ echo ''; echo ''; echo '
'; - $memberNames = array(); - foreach($memberPairs as $memberId => $member) - { - if(empty($memberId)) continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); + $membersPinYin = common::convert2Pinyin($memberPairs); } else { diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 9b35b4e7c0..ac9adf91b8 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -156,13 +156,7 @@ echo ''; echo ''; echo ''; - $memberNames = array(); - foreach($memberPairs as $memberId => $member) - { - if(empty($memberId)) continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); + $usersPinYin = common::convert2Pinyin($users); } else { @@ -172,7 +166,7 @@ foreach($users as $key => $value) { if(empty($key) or $key == 'closed') continue; - $searchKey = $withSearch ? ('data-key="' . zget($membersPinYin, $value, '') . " @$key\"") : "data-key='@$key'"; + $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $value, '') . " @$key\"") : "data-key='@$key'"; echo html::a('javascript:$(".table-actions #assignedTo").val("' . $key . '");setFormAction("' . $actionLink . '")', ' ' . $value, '', $searchKey); } echo ""; diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 1c964a04da..b7bd6c5ea5 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -297,13 +297,7 @@ - $module) - { - $moduleNames[] = $module; - } - $modulesPinYin = common::convert2Pinyin($moduleNames); +
@@ -334,14 +328,7 @@
- $plan) - { - $planNames[] = $plan; - } - $plansPinYin = common::convert2Pinyin($planNames); - ?> +
- $member) - { - if(empty($memberId) or $memberId == 'closed') continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); - ?> +
@@ -386,7 +365,7 @@ $value):?> diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index b6f6923ced..e572e676ca 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -128,13 +128,7 @@ echo ''; echo ''; echo '
'; - $memberNames = array(); - foreach($users as $memberId => $member) - { - if(empty($memberId)) continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); + $membersPinYin = common::convert2Pinyin($memberPairs); } else { diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 843a2a1b94..a12f4928f7 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -280,14 +280,7 @@ js::set('browseType', $browseType);
- $module) - { - $moduleNames[] = $module; - } - $modulesPinYin = common::convert2Pinyin($moduleNames); - ?> +
@@ -320,15 +313,7 @@ js::set('browseType', $browseType);
- $member) - { - if(empty($memberId)) continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); - ?> +
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 03fda5d7b2..170fac2c09 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -169,14 +169,7 @@ js::set('suiteID', $suiteID);
- $branchName) - { - $branchNames[] = $branchName; - } - $branchsPinYin = common::convert2Pinyin($branchNames); - ?> +
@@ -204,14 +197,7 @@ js::set('suiteID', $suiteID);
- $module) - { - $moduleNames[] = $module; - } - $modulesPinYin = common::convert2Pinyin($moduleNames); - ?> +
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index e4ccf932eb..70a043dc47 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -108,15 +108,7 @@ ?>
- $member) - { - if(empty($memberId) or $memberId == 'closed') continue; - $memberNames[] = $member; - } - $membersPinYin = common::convert2Pinyin($memberNames); - ?> +
From 35632372759a329ab1abf27f6c384148944c2788 Mon Sep 17 00:00:00 2001 From: Yagami Date: Tue, 20 Nov 2018 10:19:53 +0800 Subject: [PATCH 3/3] * Fix doc fullscreen. --- module/doc/js/view.js | 5 ++--- module/doc/lang/en.php | 2 +- module/doc/lang/zh-cn.php | 2 +- module/doc/view/view.html.php | 12 ++++-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/module/doc/js/view.js b/module/doc/js/view.js index 562365543a..32336dd778 100644 --- a/module/doc/js/view.js +++ b/module/doc/js/view.js @@ -2,14 +2,13 @@ $(function() { $('#urlIframe').height($('#mainContent').height() - 35); $('body').addClass('doc-fullscreen'); - $('#mainContent .fullscreen-btn').attr('title', reset); - setTimeout($.resetToolbarPosition, 50); $('#mainContent .fullscreen-btn').click(function() { + $('.side-col').removeClass('hidden'); $('body').toggleClass('doc-fullscreen'); if($('body').hasClass('doc-fullscreen')) { - $('#mainContent .fullscreen-btn').attr('title', reset); + $('#mainContent .fullscreen-btn').attr('title', retrack); } else { diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 546f756511..26632fecb9 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -60,7 +60,7 @@ $lang->doc->pastEdited = 'Updated'; $lang->doc->myDoc = 'My Doc'; $lang->doc->myCollection = 'My Favorite'; $lang->doc->fullscreen = 'Full Screen'; -$lang->doc->reset = 'Reset'; +$lang->doc->retrack = 'Retrack'; /* 方法列表。*/ $lang->doc->index = 'Doc Home'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 6f26f91781..e5d6447eb9 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -47,7 +47,7 @@ $lang->doc->item = '项'; $lang->doc->num = '文档数量'; $lang->doc->searchResult = '搜索结果'; $lang->doc->fullscreen = '全屏'; -$lang->doc->reset = '恢复'; +$lang->doc->retrack = '收起'; $lang->doc->moduleDoc = '按模块浏览'; $lang->doc->searchDoc = '搜索'; diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 0f67cdf001..43c428cd23 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -16,7 +16,7 @@ session->docList ? $this->session->docList : inlink('browse');?> doc->fullscreen); -js::set('reset', $lang->doc->reset); +js::set('retrack', $lang->doc->retrack); ?>