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

Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

Browse Source
This commit is contained in:
tianshujie
2023-04-24 19:19:36 +08:00
parent ec88bdf34a 75e4b26c52
commit 78ef7e88c4
14 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -3
View File
@@ -1136,9 +1136,7 @@ class actionModel extends model
->beginIF($account != 'all')->andWhere('actor')->eq($account)->fi()
->beginIF($beginDate)->andWhere('date')->ge($beginDate)->fi()
->beginIF(is_numeric($productID))->andWhere('product')->like("%,$productID,%")->fi()
->andWhere()
->markLeft(1)
->where('1=1')
->andWhere('1=1', true)
->beginIF(is_numeric($projectID))->andWhere('project')->eq($projectID)->fi()
->beginIF(!empty($executions))->andWhere('execution')->in(array_keys($executions))->fi()
->beginIF(is_numeric($executionID))->andWhere('execution')->eq($executionID)->fi()
module/admin/control.php
+1 -1
View File
@@ -478,7 +478,7 @@ class admin extends control
$response['thisTable'] = '';
$response['nextTable'] = '';
$tableEngines = $this->loadModel('misc')->getTableEngines();
$tableEngines = $this->dao->getTableEngines();
$thisTable = '';
$nextTable = '';
module/common/model.php
+1
View File
@@ -2078,6 +2078,7 @@ EOF;
if(strtolower($key) == 'assigneddate') continue;
if(strtolower($key) == 'editedby') continue;
if(strtolower($key) == 'editeddate') continue;
if(strtolower($key) == 'editingdate') continue;
if(strtolower($key) == 'uid') continue;
if(strtolower($key) == 'finisheddate' and $value == '') continue;
if(strtolower($key) == 'canceleddate' and $value == '') continue;
module/convert/model.php
+7 -7
View File
@@ -128,7 +128,7 @@ class convertModel extends model
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('t1.`ID`, t1.`lower_user_name` as account, t1.`lower_display_name` as realname, t1.`lower_email_address` as email, t1.created_date as `join`, t2.user_key as userCode')->from(JIRA_USERINFO)->alias('t1')
->leftJoin(JIRA_USER)->alias('t2')->on('t1.`lower_user_name` = t2.`lower_user_name`')
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('t1.ID')->gt($lastID)->fi()
->orderBy('t1.ID asc')->limit($limit)
->fetchAll('ID');
@@ -136,7 +136,7 @@ class convertModel extends model
elseif($module == 'project')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_PROJECT)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
@@ -144,7 +144,7 @@ class convertModel extends model
elseif($module == 'issue')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_ISSUE)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
@@ -152,7 +152,7 @@ class convertModel extends model
elseif($module == 'build')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_BUILD)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
@@ -160,7 +160,7 @@ class convertModel extends model
elseif($module == 'issuelink')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_ISSUELINK)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
@@ -168,7 +168,7 @@ class convertModel extends model
elseif($module == 'action')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_ACTION)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
@@ -176,7 +176,7 @@ class convertModel extends model
elseif($module == 'file')
{
$dataList = $this->dao->dbh($this->sourceDBH)->select('*')->from(JIRA_FILE)
->where(1)
->where('1=1')
->beginIF($lastID)->andWhere('ID')->gt($lastID)->fi()
->orderBy('ID asc')->limit($limit)
->fetchAll('ID');
module/doc/model.php
+1 -1
View File
@@ -1218,7 +1218,7 @@ class docModel extends model
if($libID == 0 and $browseType != 'collectedbyme') return array();
$modules = $this->dao->select('*')->from(TABLE_MODULE)
->where(1)
->where('1=1')
->beginIF($browseType != "collectedbyme")->andWhere('root')->eq($libID)->fi()
->beginIF($browseType == "collectedbyme")->andWhere('collector')->like("%,{$this->app->user->account},%")->fi()
->andWhere('type')->eq('doc')
module/install/control.php
+2 -2
View File
@@ -299,9 +299,9 @@ class install extends control
$canDelFile = is_writable($this->app->getAppRoot() . 'www');
$installFile = $this->app->getAppRoot() . 'www/install.php';
$upgradeFile = $this->app->getAppRoot() . 'www/upgrade.php';
$installFileDeleted = $canDelFile && is_writable($installFile) ? unlink($installFile) : false;
$installFileDeleted = ($canDelFile and file_exists($installFile)) ? unlink($installFile) : false;
if($canDelFile and is_writable($upgradeFile)) unlink($upgradeFile);
if($canDelFile and file_exists($upgradeFile)) unlink($upgradeFile);
unset($_SESSION['installing']);
session_destroy();
module/kanban/model.php
+2 -2
View File
@@ -3705,7 +3705,7 @@ class kanbanModel extends model
public function getColumnsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = '0')
{
return $this->dao->select('*')->from(TABLE_KANBANCOLUMN)
->where(true)
->where('1=1')
->beginIF($objectType)->andWhere($objectType)->eq($objectID)->fi()
->beginIF($archived != '')->andWhere('archived')->eq($archived)->fi()
->beginIF($deleted != '')->andWhere('deleted')->eq($deleted)->fi()
@@ -3817,7 +3817,7 @@ class kanbanModel extends model
public function getCardsByObject($objectType = '', $objectID = 0, $archived = '0', $deleted = '0')
{
return $this->dao->select('*')->from(TABLE_KANBANCARD)
->where(true)
->where('1=1')
->beginIF($objectType)->andWhere($objectType)->eq($objectID)->fi()
->beginIF($archived != '')->andWhere('archived')->eq($archived)->fi()
->beginIF($deleted != '')->andWhere('deleted')->eq($deleted)->fi()
module/product/model.php
+1 -1
View File
@@ -370,7 +370,7 @@ class productModel extends model
/* Order by program. */
return $this->dao->select("t1.*, IF(INSTR(' closed', t1.status) < 2, 0, 1) AS isClosed")->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->where(1)
->where('1=1')
->beginIF(strpos($mode, 'all') === false)->andWhere('t1.deleted')->eq(0)->fi()
->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
module/search/model.php
+4 -8
View File
@@ -463,12 +463,10 @@ class searchModel extends model
{
$queries = $this->dao->select('id, title')
->from(TABLE_USERQUERY)
->where()
->markLeft(1)
->where('account')->eq($this->app->user->account)
->where('module')->eq($module)
->andWhere('account', true)->eq($this->app->user->account)
->orWhere('common')->eq(1)
->markRight(1)
->andWhere('module')->eq($module)
->orderBy('id_desc')
->fetchPairs();
if(!$queries) return array('' => $this->lang->search->myQuery);
@@ -487,12 +485,10 @@ class searchModel extends model
{
$queries = $this->dao->select('id, account, title')
->from(TABLE_USERQUERY)
->where()
->markLeft(1)
->where('account')->eq($this->app->user->account)
->where('module')->eq($module)
->andWhere('account', true)->eq($this->app->user->account)
->orWhere('common')->eq(1)
->markRight(1)
->andWhere('module')->eq($module)
->orderBy('id_desc')
->fetchAll();
if(!$queries) return array('' => $this->lang->search->myQuery);
module/todo/lang/de.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->todo->finish = "Abschließen";
$lang->todo->batchFinish = "Mehrere abschließen";
$lang->todo->export = "Exportieren";
$lang->todo->delete = "Löschen";
$lang->todo->import2Today = "Importieren für Heute";
$lang->todo->import2Today = "Change Date";
$lang->todo->import = "Importieren";
$lang->todo->legendBasic = "Basis Info";
$lang->todo->cycle = "Wiederkehrend";
module/todo/lang/en.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->todo->finish = "Finish Todo";
$lang->todo->batchFinish = "Batch Finish";
$lang->todo->export = "Export Todo";
$lang->todo->delete = "Delete Todo";
$lang->todo->import2Today = "Import to Today";
$lang->todo->import2Today = "Change Date";
$lang->todo->import = "Import";
$lang->todo->legendBasic = "Basic Info";
$lang->todo->cycle = "Recur";
module/todo/lang/fr.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->todo->finish = "Terminer";
$lang->todo->batchFinish = "Terminer par lot";
$lang->todo->export = "Exporter Agenda";
$lang->todo->delete = "Supprimer";
$lang->todo->import2Today = "Importer à Aujourd'hui";
$lang->todo->import2Today = "Change Date";
$lang->todo->import = "Importer";
$lang->todo->legendBasic = "Infos de Base";
$lang->todo->cycle = "Rendre Récurrent";
module/todo/lang/zh-cn.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->todo->finish = "完成待办";
$lang->todo->batchFinish = "批量完成";
$lang->todo->export = "导出待办";
$lang->todo->delete = "删除待办";
$lang->todo->import2Today = "导入到今天";
$lang->todo->import2Today = "修改日期";
$lang->todo->import = "导入";
$lang->todo->legendBasic = "基本信息";
$lang->todo->cycle = "周期";
module/user/model.php
+1 -1
View File
@@ -41,7 +41,7 @@ class userModel extends model
public function getList($params = 'nodeleted')
{
return $this->dao->select('*')->from(TABLE_USER)
->where(true)
->where('1=1')
->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq('inside')->fi()
->beginIF(strpos($params, 'nodeleted') !== false)->andWhere('deleted')->eq(0)->fi()
->orderBy('account')