From 60b0c5895ab2ffd6cdafc068b784dcaa45e1f015 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Fri, 1 Apr 2022 16:03:41 +0800 Subject: [PATCH 1/6] * format. --- xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php index c71cccd05b..af63fb354a 100644 --- a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php +++ b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php @@ -136,9 +136,7 @@ goback, '', 'class="btn" style="min-width: 120px"');?> xuanxuan->turnon ? '' : 'disabled';?> - im->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'"); - }?> + im->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?> im->downloadConfig, 'hiddenwin', "class='btn btn-primary download $disabled'");?> im->changeSetting, '', "class='btn'");?> im->viewDebug, '', "class='btn viewDebug iframe' data-height=220");?> From eaf725035730259244dad439619da9deda2945d2 Mon Sep 17 00:00:00 2001 From: chaideqing Date: Sat, 2 Apr 2022 09:11:13 +0800 Subject: [PATCH 2/6] * fix cannot close page when click runcase in xuanxuan card --- module/testcase/view/view.html.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index b87f82e4bf..4b2f93754f 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -118,8 +118,16 @@ if(!$isLibCase) { if(!isonlybody()) echo "
"; - common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody iframe', false, "data-width='95%'"); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'"); + if($this->app->getViewType() == 'xhtml') + { + common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody', false, "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody', false, "data-width='95%'"); + } + else + { + common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody iframe', false, "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'"); + } if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'"); } From a12b67fd3b62b707868bb44066c0da176aca7969 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Wed, 6 Apr 2022 15:04:33 +0800 Subject: [PATCH 3/6] * add integration module and whitelist its method. --- Makefile | 4 ++-- .../xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index db4f18f7fd..35ccbe39e8 100644 --- a/Makefile +++ b/Makefile @@ -75,14 +75,14 @@ zentaoxx: cp -r xuan/xxb/db/*.sql zentaoxx/db/ cp -r xuan/xxb/module/im zentaoxx/extension/xuan/ cp -r xuan/xxb/module/client zentaoxx/extension/xuan/ - cp -r xuan/xxb/module/license zentaoxx/extension/xuan/ cp -r xuan/xxb/module/conference zentaoxx/extension/xuan/ + cp -r xuan/xxb/module/integration zentaoxx/extension/xuan/ + cp -r xuan/xxb/module/license zentaoxx/extension/xuan/ mkdir -p zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/header.modal.html.php zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/marked.html.php zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/footer.modal.html.php zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/version.html.php zentaoxx/extension/xuan/common/view - cp -r xuan/xxb/module/license zentaoxx/extension/xuan/ mkdir -p zentaoxx/www/js/ cp -r xuan/xxb/www/js/markedjs zentaoxx/www/js/ cp -r xuan/xxb/www/js/version.js zentaoxx/www/js/ diff --git a/xuanxuan/extension/xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php b/xuanxuan/extension/xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php index 2f3eece23b..0cf0f1c609 100644 --- a/xuanxuan/extension/xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php @@ -1,2 +1,3 @@ Date: Wed, 6 Apr 2022 15:04:33 +0800 Subject: [PATCH 4/6] * set integration for xuan. --- xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php b/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php index 0739d8dde2..3f5103ac2a 100644 --- a/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php +++ b/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php @@ -24,6 +24,8 @@ class myIm extends im $output->data = 'locked'; die($this->app->encrypt($output)); } + $this->app->loadConfig('file'); + if(isset($this->config->file->collaboraPath)) $this->config->integration = (object)array('office' => (object)array('officeEnabled' => true)); parent::sysGetServerInfo($account, $password, $apiVersion, $userID, $version, $device); } } From f0eaee1739fb986727a65a1d3acfbeaa5d9d8539 Mon Sep 17 00:00:00 2001 From: Chenjianyu Date: Wed, 6 Apr 2022 17:04:36 +0800 Subject: [PATCH 5/6] * Fix bug #52077, overwrite .main-actions-holder style to block infinite scrolling. --- module/common/view/header.lite.html.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index 807b39b71c..8b56cc839c 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -88,3 +88,8 @@ if(file_exists($xuanExtFile)) include $xuanExtFile; +app->getViewType() == 'xhtml'):?> + + \ No newline at end of file From 896e8c06cc79ed26f9908cc8b8eccb6e9e2a6aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E7=9D=BF=20=E6=9D=8E?= Date: Thu, 7 Apr 2022 08:21:43 +0000 Subject: [PATCH 6/6] * fix indent. --- module/testcase/view/view.html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 4b2f93754f..30688c95c7 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -120,13 +120,13 @@ if(!isonlybody()) echo "
"; if($this->app->getViewType() == 'xhtml') { - common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody', false, "data-width='95%'"); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody', false, "data-width='95%'"); + common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody', false, "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody', false, "data-width='95%'"); } else { - common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody iframe', false, "data-width='95%'"); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'"); + common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', 'play', '', 'showinonlybody iframe', false, "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'"); } if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");