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

* Fix bug #34687.

Browse Source
This commit is contained in:
qixinzhi
2023-04-26 10:01:18 +00:00
parent a606bb13e9
commit 29031e1fd8
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+7 -6
View File
@@ -615,17 +615,18 @@ class chartModel extends model
if($field)
{
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
if(!is_file($path)) return;
include $path;
$options = $schema->fields[$field]['options'];
if(is_file($path))
{
include $path;
$options = $schema->fields[$field]['options'];
}
}
break;
case 'object':
if($field)
{
$table = zget($this->config->objectTables, $object);
$options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$table = zget($this->config->objectTables, $object);
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
}
break;
case 'string':
module/pivot/model.php
+7 -5
View File
@@ -1917,16 +1917,18 @@ class pivotModel extends model
if($field)
{
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
include $path;
$options = $schema->fields[$field]['options'];
if(is_file($path))
{
include $path;
$options = $schema->fields[$field]['options'];
}
}
break;
case 'object':
if($field)
{
$table = zget($this->config->objectTables, $object);
$options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$table = zget($this->config->objectTables, $object);
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
}
break;
case 'string':
module/screen/model.php
+7 -5
View File
@@ -746,16 +746,18 @@ class screenModel extends model
if($field)
{
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
include $path;
$options = $schema->fields[$field]['options'];
if(is_file($path))
{
include $path;
$options = $schema->fields[$field]['options'];
}
}
break;
case 'object':
if($field)
{
$table = zget($this->config->objectTables, $object);
$options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
$table = zget($this->config->objectTables, $object);
if($table) $options = $this->dao->select("id, {$field}")->from($table)->fetchPairs();
}
break;
case 'string':