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

* finish task #3088.

Browse Source
This commit is contained in:
wangyidong
2017-08-23 14:55:49 +08:00
parent 0ee04f80d1
commit 094c960bf4
51 changed files with 225 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dev/model.php
+9 -3
View File
@@ -35,11 +35,13 @@ class devModel extends model
*/
public function getFields($table)
{
$module = substr($table, strpos($table, '_') + 1);
$module = substr($table, strpos($table, '_') + 1);
$aliasModule = $subLang = '';
try
{
if($module == 'case') $module = 'testcase';
$this->app->loadLang($module);
if(isset($this->config->dev->tableMap[$module])) $aliasModule = $this->config->dev->tableMap[$module];
if(strpos($aliasModule, '-') !== false) list($aliasModule, $subLang) = explode('-', $aliasModule);
$this->app->loadLang($aliasModule ? $aliasModule : $module);
}
catch(PDOException $e)
{
@@ -57,6 +59,7 @@ class devModel extends model
{
$this->sqlError($e);
}
foreach($rawFields as $rawField)
{
$firstPOS = strpos($rawField->type, '(');
@@ -64,6 +67,9 @@ class devModel extends model
$type = str_replace(array('big', 'small', 'medium', 'tiny'), '', $type);
$field = array();
$field['name'] = isset($this->lang->$module->{$rawField->field}) ? $this->lang->$module->{$rawField->field} : '';
if(empty($field['name']) and $aliasModule) $field['name'] = isset($this->lang->$aliasModule->{$rawField->field}) ? $this->lang->$aliasModule->{$rawField->field} : '';
if($subLang) $field['name'] = isset($this->lang->$aliasModule->$subLang->{$rawField->field}) ? $this->lang->$aliasModule->$subLang->{$rawField->field} : $field['name'];
if(!is_string($field['name'])) $field['name'] = '';
$field['null'] = $rawField->null;
if($type == 'enum' or $type == 'set')