Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/xuanxuan_96' into 'master'

Browse Source 
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2769
This commit is contained in:
王怡栋
2022-04-07 08:38:10 +00:00
parent 4b8ed58692 896e8c06cc
commit f7ded5c5cf
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -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/
module/common/view/header.lite.html.php
+5
View File
@@ -88,3 +88,8 @@ if(file_exists($xuanExtFile)) include $xuanExtFile;
<?php else: ?>
<body class='<?php echo $singleClass;?>'>
<?php endif; ?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<style>
.main-actions-holder {display: none !important;}
</style>
<?php endif;?>
module/testcase/view/view.html.php
+10 -2
View File
@@ -119,8 +119,16 @@
if(!$isLibCase)
{
if(!isonlybody()) echo "<div class='divider'></div>";
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%'");
}
xuanxuan/extension/xuan/common/ext/model/hook/isOpenMethod.xuanxuan.php
+2 -1
View File
@@ -1,2 +1,3 @@
<?php
if($module == 'entry' and $method == 'visit') return true;
if($module == 'entry' and $method == 'visit') return true;
if($module == 'integration' and $method == 'wopi') return true;
xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php
+2
View File
@@ -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);
}
}