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

Merge branch 'importExport' into 'master'

Browse Source 
* Format code for port.

See merge request easycorp/zentaopms!4944
This commit is contained in:
王怡栋
2022-08-12 00:49:44 +00:00
parent 1d1379392a baf02b5fe3
commit 1c95b63d7b
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/port/control.php
+4 -6
View File
@@ -104,13 +104,11 @@ class port extends control
$file = $this->loadModel('file')->getUpload('file');
$file = $file[0];
$shortName = $this->file->getSaveName($file['pathname']);
if(empty($shortName))
{
die(js::alert($this->lang->excel->emptyFileName));
}
$extension = $file['extension'];
$fileName = $this->file->savePath . $shortName;
if(empty($shortName)) die(js::alert($this->lang->excel->emptyFileName));
$extension = $file['extension'];
$fileName = $this->file->savePath . $shortName;
move_uploaded_file($file['tmpname'], $fileName);
module/port/model.php
+5 -14
View File
@@ -401,10 +401,8 @@ class portModel extends model
$dataList = array();
$sysDataFields = explode(',', $this->portConfig->sysDataFields);
foreach($sysDataFields as $field)
{
$dataList[$field] = $this->loadModel($field)->getPairs();
}
foreach($sysDataFields as $field) $dataList[$field] = $this->loadModel($field)->getPairs();
return $dataList;
}
@@ -523,8 +521,7 @@ class portModel extends model
*/
public function getSourceByLang($lang)
{
$lang = isset($this->modelLang->$lang) ? $this->modelLang->$lang : '';
return $lang;
return isset($this->modelLang->$lang) ? $this->modelLang->$lang : '';
}
/**
@@ -733,10 +730,7 @@ class portModel extends model
}
/* Deal children datas and multiple tasks .*/
if($modelDatas)
{
$modelDatas = $this->updateChildDatas($modelDatas);
}
if($modelDatas) $modelDatas = $this->updateChildDatas($modelDatas);
return $modelDatas;
}
@@ -790,10 +784,7 @@ class portModel extends model
$relatedObjectIdList = array();
$relatedObjects = array();
foreach($datas as $data)
{
$relatedObjectIdList[$data->$object] = $data->$object;
}
foreach($datas as $data) $relatedObjectIdList[$data->$object] = $data->$object;
if($object == 'openedBuild') $object = 'build';