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

* adjust for doc and testcase view page in card.

Browse Source
This commit is contained in:
wangyidong
2018-12-18 13:03:50 +08:00
parent bcf24e9f50
commit e6bd9c4ae9
13 changed files with 70 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+4 -4
View File
@@ -43,10 +43,10 @@ class control extends baseControl
/* If the main view file doesn't exist, set the device prefix to empty and reset the main view file. */
if(!file_exists($mainViewFile))
{
$oldPrefix = $this->devicePrefix;
$originalPrefix = $this->devicePrefix;
$this->devicePrefix = '';
$mainViewFile = $modulePath . 'view' . DS . $this->devicePrefix . $methodName . '.' . $viewType . '.php';
$this->devicePrefix = $oldPrefix;
$this->devicePrefix = $originalPrefix;
}
$viewFile = $mainViewFile;
@@ -97,11 +97,11 @@ class control extends baseControl
/* If the js or css file doesn't exist, set the device prefix to empty and reset the js or css file. */
if($this->viewType == 'xhtml')
{
$oldPrefix = $this->devicePrefix;
$originalPrefix = $this->devicePrefix;
$this->devicePrefix = '';
$css .= $this->getCSS($moduleName, $methodName);
$js .= $this->getJS($moduleName, $methodName);
$this->devicePrefix = $oldPrefix;
$this->devicePrefix = $originalPrefix;
}
if($css) $this->view->pageCSS = $css;
if($js) $this->view->pageJS = $js;