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/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 diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index a849bea77f..37a3ad7e13 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -119,8 +119,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%'"); } 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 @@ 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); } }