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

* adjust for web page.

Browse Source
This commit is contained in:
wangyidong
2022-04-25 15:20:05 +08:00
parent 580132c2c8
commit 668637fc18
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+11 -3
View File
@@ -482,6 +482,11 @@ class baseControl
{
if(empty($cssPath)) continue;
$extMethodCssFile = dirname(dirname($cssPath)) . DS . 'css' . DS . $devicePrefix . $methodName . '.css';
if(is_file($extMethodCssFile)) $js .= file_get_contents($extMethodCssFile);
$extMethodCssLangFile = dirname(dirname($cssPath)) . DS . 'css' . DS . $devicePrefix . "{$methodName}.{$clientLang}.css";
if(is_file($extMethodCssLangFile)) $js .= file_get_contents($extMethodCssLangFile);
$cssMethodExt = $cssPath . $methodName . DS;
$cssCommonExt = $cssPath . 'common' . DS;
@@ -576,6 +581,9 @@ class baseControl
{
if(empty($jsPath)) continue;
$extMethodJsFile = dirname(dirname($jsPath)) . DS . 'js' . DS . $this->devicePrefix . $methodName . '.js';
if(is_file($extMethodJsFile)) $js .= file_get_contents($extMethodJsFile);
$jsMethodExt = $jsPath . $methodName . DS;
$jsCommonExt = $jsPath . 'common' . DS;
@@ -942,9 +950,9 @@ class baseControl
die(isset($data['message']) ? $data['message'] : 'fail');
}
$message = json_decode(json_encode((array)$data['message']));
foreach((array)$message as $item => $errors) $message->$item = implode(',', $errors);
die(js::alert(strip_tags(implode('\n', (array)$message))));
$message = json_decode(json_encode($data['message']), true);
foreach($message as $item => $errors) $message[$item] = implode(',', $errors);
die(js::alert(strip_tags(implode('\n', $message))));
}
die('fail');
}
framework/control.class.php
+1
View File
@@ -206,6 +206,7 @@ class control extends baseControl
$viewFile = $commonExtViewFile;
}
if(!is_file($viewFile)) $viewFile = dirname(dirname($viewExtPath['common'])) . DS . 'view' . DS . $this->devicePrefix . $methodName . ".{$viewType}.php";
if(!is_file($viewFile)) die(js::error($this->lang->notPage) . js::locate('back'));
/* Get ext hook files. */
module/upgrade/control.php
+4 -2
View File
@@ -83,7 +83,7 @@ class upgrade extends control
$version = str_replace(array(' ', '.'), array('', '_'), $this->config->installedVersion);
$version = strtolower($version);
if($this->config->visions == ',lite,')
if($this->config->visions == ',lite,')
{
$installedVersion = str_replace('.', '_', $this->config->installedVersion);
$version = array_search($installedVersion, $this->config->upgrade->liteVersion);
@@ -92,7 +92,7 @@ class upgrade extends control
{
if(strpos($key, 'lite') === false) unset($this->lang->upgrade->fromVersions[$key]);
}
$this->config->version = ($this->config->edition == 'biz' ? 'LiteVIP' : 'Lite') . $this->config->liteVersion;
}
@@ -238,6 +238,8 @@ class upgrade extends control
*/
public function mergeProgram($type = 'productline', $programID = 0, $projectType = 'project')
{
set_time_limit(0);
$this->session->set('upgrading', true);
$this->app->loadLang('program');
$this->app->loadLang('project');